From 37619a10eb4b070dccb2023cd36dda10a68485fb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 22:21:57 +0000 Subject: [PATCH 001/118] Fix: Avoid errors into rpm packages --- build/deb/README | 2 +- build/deb/changelog | 2 +- build/deb/control.DEBIAN | 46 + build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 - build/deb/install | 1 - build/deb/postinst | 100 +- build/deb/postrm | 119 +- build/makepack-dolibarr.pl | 164 ++- build/rpm/README | 13 +- build/rpm/dolibarr.desktop | 3 +- build/rpm/dolibarr.spec | 173 ++- build/rpm/file_contexts.dolibarr | 6 +- dev/skeletons/modMyModule.class.php | 4 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 33 +- htdocs/admin/perms.php | 32 +- htdocs/admin/system/index.php | 7 +- htdocs/boxes.php | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/tpl/menu.tpl.php | 13 +- htdocs/cashdesk/tpl/validation1.tpl.php | 21 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/core/class/conf.class.php | 9 +- htdocs/core/class/cookie.class.php | 5 +- htdocs/filefunc.inc.php | 7 +- htdocs/imports/import.php | 7 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 +++++++++-------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/index.php | 7 +- htdocs/install/check.php | 5 +- htdocs/install/default.css | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 5 +- .../mysql/data/llx_20_c_departements.sql | 5 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- .../install/mysql/data/llx_c_currencies.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/data/llx_c_tva.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_departements.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_regions.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- htdocs/install/mysql/tables/llx_commande.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../mysql/tables/llx_commande_fournisseur.sql | 5 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../tables/llx_product_fournisseur.key.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/install/upgrade2.php | 7 +- htdocs/langs/es_ES/html/gpl.html | 330 ++++++ htdocs/langs/nl_BE/html/gpl.txt | 340 ++++++ htdocs/langs/nl_NL/html/gpl.txt | 339 ++++++ htdocs/lib/admin.lib.php | 77 +- htdocs/lib/ajax.lib.php | 5 +- htdocs/lib/pdf.lib.php | 5 +- htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 9 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- htdocs/societe/soc.php | 10 +- htdocs/theme/auguria/style.css.php | 4 +- .../smartphone/theme/default/default.css.php | 5 +- htdocs/user/group/perms.php | 34 +- htdocs/user/perms.php | 32 +- 346 files changed, 2867 insertions(+), 1695 deletions(-) create mode 100755 build/deb/control.DEBIAN create mode 100644 htdocs/langs/es_ES/html/gpl.html create mode 100644 htdocs/langs/nl_BE/html/gpl.txt create mode 100644 htdocs/langs/nl_NL/html/gpl.txt 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 3382966714b..b035f18ae1d 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 + -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN new file mode 100755 index 00000000000..7c66775bdf1 --- /dev/null +++ b/build/deb/control.DEBIAN @@ -0,0 +1,46 @@ +Package: dolibarr +Version: __VERSION__ +Architecture: all +Maintainer: Laurent Destailleur +Installed-Size: 61200 +Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Section: web +Priority: optional +Homepage: http://www.dolibarr.org +Description: Easy to use web based ERP & CRM software + Dolibarr ERP & CRM is an easy to use open source/free software for small + and medium companies, foundations or freelances. It includes different + features for Enterprise Resource Planning (ERP) and Customer Relationship + Management (CRM) but also for different other activities. + It's a web software you can install as a standalone program or on any web + hosting provider to use it from anywhere with any web browser. + Dolibarr was designed to provide only features you need and be easy to use. + . + Only features you need are visible, depending on which module were activated. + Most common used modules are: + . + Customers, Suppliers or Prospects directory, + Contacts directory, + Orders management, + Commercial proposals management, + Invoices management, + Products and services catalog, + Stock management, + Foundations members management, + Bank accounts management, + Point of Sale, + Payments management, + Commercial actions management, + Contracts management, + Standing orders management, + Shipping management, + Donations management, + Bookmarks management, + Mass Emailings, + Reports, + Wizards to export and import data, + LDAP connectivity, + PDF exports, + And a lot of more modules... + . + You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index e28258d8dbc..91f0705c001 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,16 +4,10 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper (>= 7), po-debconf +Build-Depends: debhelper, po-debconf Package: dolibarr -Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, - php5-mysql | php5-mysqli, - php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, - ${misc:Depends}, xdg-utils, - mysql-server, perl -Recommends: apache2 | lighttpd | httpd, mysql-client -Suggests: www-browser +Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl Architecture: all Section: web Priority: optional diff --git a/build/deb/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 b/build/deb/install index 2928d378abc..4d41fd52c65 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,5 +1,4 @@ etc/dolibarr/apache.conf -etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/postinst b/build/deb/postinst index e0bba1be4da..ca5fd1645dd 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,5 +1,7 @@ #!/bin/sh # postinst script for dolibarr +# +# see: dh_installdeb(1) set -e @@ -14,31 +16,6 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - - -lighttpd_install() { - if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - if which lighty-enable-mod >/dev/null 2>&1 ; then - echo "Add link for Lighttpd config file" - ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf - # We enabled it - lighty-enable-mod dolibarr fastcgi-php - else - echo "Lighttpd not installed, skipping" - fi - fi -} - -apache_install() { - webserver=$1 - if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Add link for Apache config file" - ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - . /usr/share/debconf/confmodule db_version 2.0 @@ -50,6 +27,8 @@ echo Run the dolibarr postinst script # Define vars docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" installconfig="/etc/dolibarr/install.forced.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php" @@ -65,6 +44,10 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir + # Copy apache.conf file into target directory + #mkdir -p /etc/dolibarr + #cp -p $apachefileorig $apacheconfig + # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -91,15 +74,21 @@ case "$1" in chmod -R 660 $config fi - - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - + # Get the web server type (use db_get for interactive mode). + #db_reset "dolibarr/webserver" + #db_get "dolibarr/webserver" # Read value for webserver. + #webserver="$RET" + + case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; + esac + # Set up web server. - for webserver in $webservers ; do - webserver=${webserver%,} - echo Complete config of server $webserver + for server in $webservers ; do + echo Complete config of server $server # Detect webuser and webgroup webuser= @@ -117,31 +106,26 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config + + # Add link to config file + echo Setup web server $server to add dolibarr config file + ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf + done - # Restart web server. - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_install - else - apache_install $webserver - fi - # Reload webserver in any case, configuration might have changed - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $webserver reload 3>/dev/null || true - else - echo Restart web server $server using $server reload - /etc/init.d/$webserver reload 3>/dev/null || true - fi - fi + # Restart servers + servers="apache2-ssl apache2 mysql" + # Another way to restart + for server in $servers ; do + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $server reload || true + else + echo Restart web server $server using $server reload + /etc/init.d/$server reload || true + fi done - echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -152,13 +136,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument $1" >&2 + echo "postinst called with unknown argument \`$1'" >&2 exit 0 ;; esac -#DEBHELPER# - db_stop +#DEBHELPER# + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 27ce3777b7e..9eae81b022b 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,36 +17,7 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - -lighttpd_remove() { - if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - echo "Remove link for Lighttpd config file" - rm -f /etc/lighttpd/conf-available/50-dolibarr.conf - if which lighty-enable-mod >/dev/null 2>&1 ; then - lighty-disable-mod dolibarr - else - echo "Lighttpd not installed, skipping" - fi - # See bug #448682 - if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then - echo 'Manually deleting lighttpd/dolibarr configuration link' - rm /etc/lighttpd/conf-enabled/50-dolibarr.conf - fi - fi -} - -apache_remove() { - if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Remove link for Apache config file" - rm -f /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule -fi +. /usr/share/debconf/confmodule db_version 2.0 @@ -55,62 +26,63 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" +export webserver="" +# Allows us to loop and substitute in one pass +case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; +esac + case "$1" in # Call when we upgrade upgrade) - echo "postrm upgrade" ;; # Call when we uninstall remove) - echo "postrm remove" rm -f $lockfile - # Reconfigure web server - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - - # Restart web servers - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_remove - else - apache_remove $webserver - fi - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $webserver reload 3>/dev/null || true - else - /etc/init.d/$webserver reload 3>/dev/null || true - fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete link $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge" + echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical dolibarr/postrm || true + db_input critical "dolibarr/postrm" || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get dolibarr/postrm + db_get "dolibarr/postrm" set -e if [ "$RET" = "true" ] ; then @@ -213,12 +185,41 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete file $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" + fi + done + rm -rf /etc/dolibarr + # Restart servers + for server in $restart ; do + # We disable blocking errors + set +e + echo "Restart server $server if exists" + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $server reload || true + else + /etc/init.d/$server reload || true + fi + # We restore blocking errors + set -e + done + # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset dolibarr/reconfigure-webserver - db_reset dolibarr/postrm + db_reset "dolibarr/postrm" set -e #db_purge @@ -228,7 +229,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument $1" >&2 + echo "postrm called with unknown argument \`$1'" >&2 exit 0 ;; esac diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index af7d522b167..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.131 2011/08/03 01:43:26 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.131 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -306,23 +306,18 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; + #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; + #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; } # Build package for each target @@ -445,60 +440,57 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$FILENAMETGZ2"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; - print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n"; - $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\""; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; $ret=`$cmd`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; # Apache conf files - print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; - $ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`; + #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; # Dolibarr conf files # TODO @@ -523,21 +515,21 @@ if ($nboftargetok) { $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; # Build tgz @@ -574,11 +566,9 @@ if ($nboftargetok) { next; } - + if ($target eq 'DEB') { - $olddir=getcwd(); - $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -613,7 +603,7 @@ if ($nboftargetok) { $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; - open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error"; + open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -667,7 +657,6 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`; @@ -682,22 +671,19 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache and lighttpd conf files + # Apache conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; + + # Dolibarr conf files + # TODO # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -743,15 +729,17 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - # Creation of binary package (to build without sources) - #print "Go to directory $BUILDROOT\n"; - #chdir("$BUILDROOT"); + print "Go to directory $BUILDROOT\n"; + $olddir=getcwd(); + chdir("$BUILDROOT"); + + # Creation of binary package (to build without sources) #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Prepare source package + # Creation of source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -763,7 +751,6 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; - $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -779,9 +766,6 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; - - # Creation of source package - print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; 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 e6996caa4b3..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,39 +205,36 @@ 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 ] then echo Create empty file $config touch $config - %{__chown} -R root:$apachegroup $config - %{__chmod} -R 660 $config + chown -R root:$apachegroup $config + chmod -R 660 $config fi # Create config file for apache $apacheconfig -#if [ ! -f $apacheconfig ]; then -# echo Create dolibarr web server config file $apacheconfig -# cp $apachefileorig $apacheconfig -# chmod a-x $apacheconfig -# chmod go-w $apacheconfig -#fi +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 - semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" - semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" - semanage fcontext -a -t httpd_sys_script_rw_t "/var/www/dolibarr/install.lock" - restorecon -R -v /etc/dolibarr - restorecon -R -v /usr/share/dolibarr - restorecon -v /var/www/dolibarr/install.lock +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 @@ -257,13 +245,25 @@ fi # Set permissions echo Set permission to $apacheuser:$apachegroup on $targetdir -%{__chown} -R $apacheuser:$apachegroup $targetdir -%{__chmod} -R a-w $targetdir -%{__chmod} u+w $targetdir +chown -R $apacheuser:$apachegroup $targetdir +chmod -R a-w $targetdir +chmod u+w $targetdir echo Set permission to $apacheuser:$apachegroup on $docdir -%{__chown} -R $apacheuser:$apachegroup $docdir -%{__chmod} -R o-w $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 @@ -274,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 -----" @@ -307,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 @@ -344,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 @@ -362,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/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/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/css/style.css b/htdocs/cashdesk/css/style.css index 698cceb4966..c79d46fbeb5 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,10 +11,11 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ +/* \version $Id$ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index 2d89cfd2388..f91946e11c0 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.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. */ // Instanciation et initialisation de l'objet xmlhttprequest 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/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/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 96de90124f9..259dc4dbce5 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -47,7 +48,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -66,7 +67,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -77,17 +78,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 0efb704828f..e05eaa66ecf 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ + * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ */ require('../main.inc.php'); @@ -1031,5 +1032,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); +llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 5da397b4183..d2f2a7aae7e 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ + * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ */ require('../main.inc.php'); @@ -672,5 +673,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); +llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); ?> diff --git a/htdocs/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/filefunc.inc.php b/htdocs/filefunc.inc.php index 3148174f5af..13a97bf54b3 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,14 +20,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -64,7 +65,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 97d4d8252d3..c03b55d2347 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ + * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ */ require_once("../main.inc.php"); @@ -1668,7 +1669,7 @@ print '
    '; $db->close(); -llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); +llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); /* diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 6f6c7ed2a1b..257b95e4e3c 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -64,7 +65,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.31 $'); + $ver=explode(' ','$Revision: 1.30 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 446606ef055..127eb16e389 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -63,7 +64,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
    This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.28 $'); + $ver=explode(' ','$Revision: 1.27 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 46fa4c9ccc4..9c90d1fcc94 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,7 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program. If not, see . +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* or see http://www.gnu.org/ */ /** @@ -20,7 +22,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -59,7 +61,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
    This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.14 $'); + $ver=explode(' ','$Revision$'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index 7055bef4b69..ec7e1af07c6 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ + * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/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/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index 067e831b0b4..b1e3f5a2638 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,503 +1,504 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index e5f0ff4c0e5..b1e3f5a2638 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,7 +484,8 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/index.php b/htdocs/index.php index f027e94a35a..5998094d362 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -573,7 +574,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); +llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9b19d9793fc..3724ef23d95 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 1d2084e7c7f..9978c8f437a 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/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.24 2011/08/03 01:32:42 eldy Exp $ + * $Id$ */ body { diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 737e16cc10c..20ef1080e85 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ + * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index c9713870c22..5d7fca530f2 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index e7b45a476f1..d7df4ac6929 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 62e0a4a90cf..9a0dd0fcc43 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ + * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 50fa9904890..0037190af06 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 2e0fccb0051..6d19b01e197 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ + * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 223a2eb6d92..3050d37833c 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -74,12 +75,10 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -$lockfile = '../../install.lock'; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; -#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here -$lockfile = '../../install.lock'; + if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -179,7 +178,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists($lockfile)) +if (file_exists('../../install.lock')) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
    '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index 841136fff8b..c786f91346c 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ + * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 275298588e2..9d08a56e41c 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,9 +17,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_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 8ea28cbbcc3..1f046a29bc4 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -18,9 +18,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_10_c_regions.sql,v 1.14 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 4be9b6b7719..9a109ab3fdc 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -18,9 +18,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_20_c_departements.sql,v 1.16 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index da244f79951..56ceea3d807 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,9 +17,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_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index eee5dfa185a..3a248c2f49f 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,9 +18,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_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index e3922b97f65..dcbaf2faaf4 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,9 +17,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_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index b7f6c71c87e..1dd3cb59a62 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,9 +11,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_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index f3299990858..5e93e39d048 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,9 +17,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_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index 1f14cc8c142..e3ed8196d17 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,9 +17,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_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 5017ce0c60d..176e5c796e2 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,9 +17,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_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql index eeb2c376b85..ad7c175fcc4 100644 --- a/htdocs/install/mysql/data/llx_c_currencies.sql +++ b/htdocs/install/mysql/data/llx_c_currencies.sql @@ -17,9 +17,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_c_currencies.sql,v 1.8 2011/08/03 01:25:46 eldy Exp $ +-- $Id: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index f58db2b32a6..db630463dbf 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,9 +17,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_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index 079caa7dde4..c67d263853d 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,9 +17,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_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 4bb81528e74..07fa2abaa83 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,9 +18,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_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index 720413ac480..e29b3f306f5 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,9 +17,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_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index cb0b557b438..c7fa6b6dd1f 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.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_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index a3a19cc2125..6a597996424 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,9 +17,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_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 1ec498e6bc2..78e174b9817 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,9 +17,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_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a17978bb0c..3a535a5098e 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,9 +17,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_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index 96d456312df..f6395abbfcd 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,9 +17,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_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 488b0a564eb..9c28f697f83 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,9 +17,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_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index d8701c52c01..988d9c26136 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,9 +17,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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- @@ -33,4 +34,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2fd47385a90..2d1a3c62a39 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,9 +17,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_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 788e9e82f39..056dbdbdb6e 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -18,9 +18,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_c_tva.sql,v 1.27 2011/08/03 01:25:44 eldy Exp $ +-- $Id: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index da98640fd25..4238000eb14 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,9 +17,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_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 789ad16fce2..6e596be24e5 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,9 +17,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_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index 48b77951e1f..e2faed3cba3 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,9 +17,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_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index 59bd3d1ef00..cf7e9e96275 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,9 +17,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_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index cd2f27a5dca..655848a50ae 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.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: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 42f86f1c447..968a131e2bb 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -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: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 685170362fd..6e6e960072b 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.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_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 921bc569980..02ff06ba9f1 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.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_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index d5902b539c7..f22262c9353 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.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_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index ddd3d734ff7..b2cdf08af5f 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.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_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 8c5c23bbe62..031bfb614e1 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -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: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index f7b876eed86..3aa9555979e 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -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: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 8d34e2a9c78..4703aa32ddd 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -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: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index ad6f448e3dc..69bf706ca68 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,9 +15,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_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 51d66c04584..9156b439833 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,9 +15,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_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index 7df7f21a3b9..db64e0cbf9c 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -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: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index 31676d7d6e2..a7efcbd0f6d 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -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: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index bc9d9ad0936..7e4fa074e71 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -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: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index 18eed730ab8..d23a1367f92 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index ade41da746e..2b2db5af657 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index 62a88236480..b5c9175202b 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 015a9e9b4c0..6ed1e00dd88 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index 296b49fc93f..d1279c21eb2 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 9cedf70e7ca..822a69bc4ec 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index 55718d8ffb5..aba765190ee 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.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_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index abc9baa2d8c..eded16c49fe 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -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: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index 3dd83585bcd..e39fbf71f12 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -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: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 217edcaddbb..3710a87470a 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -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: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index 5869f24d8bd..ad41449f288 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -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: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index 5db17f19069..f6301a24919 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index 5f66ff625f0..cd68a9cdb40 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index b0546729ef0..890c7597862 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.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_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index 4794113f8bd..d67cf7fe4b8 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -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: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5fc25f57339..5c06c73c69d 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 5746cce26aa..115bd310d70 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index ba1e56e2b94..d3c71cc4a70 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.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_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index de9c23e9c05..10c4cc2d853 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,10 +13,11 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, 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_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index cce9d04707b..09365976d78 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.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_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 93e8e3d99a7..463b1235094 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -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: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index b0f31fe7116..c81a2b3e830 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -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: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index cb2251cfaf6..821fe3e5c04 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -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: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 8bebcf13116..9380607010d 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index b30354cae19..e524d9c937a 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index b026a40d762..0b0b34390c4 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -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: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 39d21cee7b9..7b5fa661d7d 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -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: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index d1e6b216b4b..e2f225fe608 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.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_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 60af7723f30..66cd5111325 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -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: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index cb223ae5532..ebca12ab5da 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -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: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 415b8526793..3872bedd39d 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -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: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index 5c54695f608..bed4ad41dfc 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 93ef5d59770..23cd0f575ed 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index 7702a8cf21e..f46d2a56c33 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.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_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_departements.sql b/htdocs/install/mysql/tables/llx_c_departements.sql index ea1f7543428..ab0ea5dc0c3 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.sql @@ -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: llx_c_departements.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id: llx_c_departements.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ -- ======================================================================== create table llx_c_departements diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 46a35567e95..4669de108f4 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.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_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index c2c43a3a625..a6bb8ca70f7 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -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: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 547500d7f33..5637e5a987d 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -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: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index bf7ed18af80..884d8274cfd 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.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_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index d0dceaf0fe1..2b6dea6cbd3 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -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: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 192183be0c1..76aecebbb9a 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -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: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index d6d673962b9..665a210d74b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -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: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index c8deefef6d7..7fcd57e31eb 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -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: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index 757653f1fc2..e1cab3b3368 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -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: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f2fb7fda4d3..f97e458be6b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -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: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 7a228ec1572..165a8550331 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -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: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 120e27ae77d..6efa388ef81 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.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_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index a5e3fd8721b..c8824b2d04e 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.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_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 418e37a85b1..311183c87f4 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.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_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 1cc5dbfaf0e..2d00f620e02 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -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: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 84c72e0839b..02052920c8a 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -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: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 8cf0ec900f8..0f608cbc171 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.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_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 2eed307bc54..75b40946559 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.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_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql index 5ef6fb221e6..d9d0f2d1b0c 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.sql @@ -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: llx_c_regions.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id: llx_c_regions.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ -- ======================================================================== create table llx_c_regions diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index c977dd9dd21..76caf44356d 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 8307ca88eb6..861671e3607 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -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: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 9a7bda88c28..46504e8a1c4 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -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: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index 725ddbfeb90..dc284fc8cea 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -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: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index a1feeb33f8b..4f8736a3a14 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -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. -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -23,7 +24,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 1e141b7768a..85ea592d950 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -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: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 79d54faf623..9fad6cc333e 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -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: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index 97638937c74..d6bd27758b4 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -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: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 211af70a854..40759cdc50b 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.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_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 7c4c534451d..80e73c43399 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -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: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index f2330322a5f..4c466e0c02b 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -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: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 8e4492c28a9..46a39b3c9e7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -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: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 39be52cf374..60641bf1876 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -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: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index e93ce9b4354..cfe126b5adf 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.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_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index baa01289b96..7e12e06beb7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -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: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index bd19d25f1a5..83eb804c875 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -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: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index eb95b9fe66c..6236e113766 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -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: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index 2c95fde3255..cf5121c34f9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -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: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index d62011351c4..cabdcce3a80 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index a07ff049d61..ebaf9582414 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index 730bc11ac98..fa9a85aac1f 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -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: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index 6f129f2feec..ec8931763bf 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -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: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 731cf8fb0f4..9c6e2a065f8 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -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: llx_commande.sql,v 1.14 2011/08/03 01:25:34 eldy Exp $ +-- $Id: llx_commande.sql,v 1.13 2011/07/28 22:22:31 eldy Exp $ -- =================================================================== create table llx_commande diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 172a2432ee1..7958b56f354 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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. -- --- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orphelins pour permettre mont�e de la cl� +-- Supprimme orphelins pour permettre monte de la cl -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index f1c8c7ac579..3ef51d6ae21 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -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: llx_commande_fournisseur.sql,v 1.8 2011/08/03 01:25:32 eldy Exp $ +-- $Id: llx_commande_fournisseur.sql,v 1.7 2011/07/28 22:22:31 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index c13c0aa6019..3f848c9ffe2 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index f0c65456e5c..df6d49827f6 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index be4e60a9a97..9bb45f9d326 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -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: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 23cfd068495..91914ab66c7 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -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: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b18165255..d1b39863cab 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -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: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index 19ec675f973..e964fbc2f5e 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -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: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a53a24d9a66..a747c714fb3 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.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_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 46639ca7c1e..16ecb365d6c 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.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_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index d1ba0645e05..bfce896eb19 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.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_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index b7fc52403af..51234007ee1 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.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_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index 4187f526393..eead2907fa2 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,9 +15,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_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 7b74d8b506d..1c757fa6c86 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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. -- --- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orhpelins pour permettre mont�e de la cl� +-- Supprimme orhpelins pour permettre monte de la cl -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index f1f4a75b604..79b52ba399c 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -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: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 39b89773316..3757e4522bf 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -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: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index 98b29b1f715..f5987250001 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -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: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 0eb566317d0..9c4a5e340ab 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 3fb9f7d6d2d..906d0a3e2f4 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index ba595100b5f..20bb329ff0e 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index b71d2697b85..2063a310fb8 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index 61d63046fac..a99b42859c7 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -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: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index 0e20201f4cb..f0e0a065089 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.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_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 154f0b51006..06af8a78575 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.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_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1dc4941012a..1c5d5c30173 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -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: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index a208aa5fff0..e43f4cb118c 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -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: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index f60029ee290..e4eb41f3bb4 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.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_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 2833920b746..463675b10b7 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -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: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index 7987ca819c1..fc998bd6edb 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.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_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index e027d471e23..1e9b0495d34 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -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: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ +-- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index 8b279dc578b..b899c4303e1 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.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_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 684c5aa5a7c..5d6d86617e6 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -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: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index cdccf3eb6ec..6de1b23eb64 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.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_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index fee45753759..04491e0878c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -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: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 9401f679071..575930a728c 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -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: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 757e8d2b447..46b769b8afc 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.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_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index d0118ebdc6c..e1b82141ea1 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 57d92bc8ce9..19824c860de 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 6f2ddcf56b9..455916a3010 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.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_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 6cf13137710..94e726796c5 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.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_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index cee3ace0ec3..8dbbb572f29 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -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: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 34d0bbac03b..923c2441987 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.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_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index ef97e48a251..88cf83a3cc3 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -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: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index b674a0cf11d..68e21d26061 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -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: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index 5e3620cba87..f289b9cb514 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -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: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index bd3c0c7d780..a2e54d34770 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -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: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index 1524eb7a77b..dbeec277f88 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -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: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index 75a4ce8fd06..e3e5900fb74 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.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_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index eafe6bd31e1..0669065b7d3 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -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: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index 6a06c0c70b5..dcca0174817 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -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: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index d4aa4b26d99..99cf1edd744 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.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_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index b55d734674f..415b44c6a35 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -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: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index 22a5b9d5c52..ba8b40b3c0a 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -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: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 5edbea4808d..40e131fefdf 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,9 +15,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_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index 5313952606a..bc11ca42c8f 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -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: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index c210f906b9b..8d4a4ecdcbf 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,9 +15,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_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index 29598bb4963..f43ab1e746a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.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_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index cfaad1061df..a52d3ed4a8b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -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: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 521d666742d..4e9f0d1da0e 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -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: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index 29af17f7c08..c9891219f4f 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,9 +15,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_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 917d6fc5cdf..6b8f7176dee 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -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: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 87245438b4d..399dd175311 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,9 +15,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_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index 373267c8921..c06074d4709 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,9 +15,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_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index b67427b9de8..1e3f21d0eb7 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.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_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 8f00ee95200..08450aa204f 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -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: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index edc76a392b0..9b0104ccfe5 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.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_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 302248ae299..0782e089170 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -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: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 9c741080a27..68b6cd9a315 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 4dd0ae15ad4..177be65fb88 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index ffc0666074d..d573c90eb18 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -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: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index 96f122e59cd..e0b2c2494ad 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -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: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 4beccac04b8..92000240642 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -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: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 484cebf6a2a..6240a2ed5c0 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -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: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index a56201f7dba..e2c4be38a5f 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -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: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 84f6077e5ba..51e133a86dc 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.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_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index 46685416239..aab9c69c1a7 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -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: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index 1d41d1ab59e..dc9732c0719 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -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: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index d6dd854a240..663adaffe60 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -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: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 0b7d6a61f56..73dc6489461 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -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: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index c1ee00edd07..0b42446740b 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.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_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index d694d696801..7d728850185 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -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: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index 925ca9eee81..d062249c3b8 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f67337de388..f33c92ea7fe 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 8c8454fbc28..92f21a35f28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.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_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index 6c673570cfc..e62275df23d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -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: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 9c05ed97a8d..29ad3853f90 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Oc�bo +-- Copyright (C) 2005 Marc Barilley / Ocbo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -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: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b127b194fa5..b9ba378d81f 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -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: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 5c8ea94ed09..8771b0ddda8 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.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_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 94ba92d4856..8bb011f7280 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.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_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 4017ae32682..1aba5d286d1 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -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: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index 2c77ae3447c..e0c4fd61701 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -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: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 52c0a3e2a03..1e721e86788 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.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_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index 439b2a68098..d4ea3ad5535 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.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_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index f01b7d02e8e..6f8d6a8cf97 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -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: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index bd1e805aed2..854ec6e826e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.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_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index bfc2162ceca..f1e90520593 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.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_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 784e3d37507..15d3bda5ba2 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -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: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 029bc528b6e..66a61851cae 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,9 +15,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_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 9c066c54436..195d2464738 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.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_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index f4e38524d25..44a301a2db7 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -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: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index f03d92ce651..237b5c23030 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.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_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 2c9c2d929db..3bec7551161 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index d9e9ecd43a7..45845593162 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql index f2bb73a1bda..612755ce349 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql @@ -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: llx_product_fournisseur.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id: llx_product_fournisseur.key.sql,v 1.3 2011/07/29 19:59:33 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 01cabfec865..672374961d5 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -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: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index 696cf49c337..d8d9443595d 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -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: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index 170bd56f390..f21fed4d1af 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -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: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index 5a3d71b489a..a501b4db4b6 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -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: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index d29449c2503..41a91a9aa5f 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.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_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index 86f114d395b..e12dbc6fb12 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -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: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index ce320558709..1a83bee6508 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -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: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 76f76ff08ed..93a28593f8e 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -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: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index 133687c7466..ec2bb01863b 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -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: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 6ccd3aa39fb..552a985abd4 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -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: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index e24a8918c5b..63b28ac8410 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -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: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index 26e451271cb..e7ccde53858 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -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: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index 40b07d29305..a1619df5cb5 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -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: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index e21669e63d7..309c60b660f 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.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_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index d094512d975..c92472f7af5 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -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: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index a75fb9aa76d..3fb70995900 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,9 +15,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_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ +-- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index a0d88737e3f..e7fc66a0ed6 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.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_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 9e28a37d6bb..57b252ed2ea 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -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: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index 376447586c9..b8453ea821c 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.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_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index e7528a03f28..00268974476 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -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: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 4f994cf57aa..16bf4dea7f0 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.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_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index 1a7fdfd755f..eff6387abee 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,9 +15,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_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index a618e3d8790..f53599483a4 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -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: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index 902f2b4fd5f..b9643f019c3 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.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_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index 1f5500e2eb1..db4cdd2581c 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -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: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index c7d84e27326..6bf45f749f5 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 523eb3b37e0..7db41de673c 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index bf057b4ad75..8dc4636c87e 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -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: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index ade6a40a80d..d500fc1b7cb 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.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_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index bca670bbb98..a515ba541bf 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -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: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index 7481589df00..b742b82dafc 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -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: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index 4adaa1a56ff..fff909a0ec8 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -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: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index 16631c76b76..fb65e9b7e84 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -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: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 3df14473a7e..332b1305d38 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.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_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index c3958313ea3..ca4206eb6fc 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -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: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 910d2ab2072..68e1d4f20e9 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -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: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 5c7f2e9a59c..8714e7e4a07 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -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: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index cbaadb10091..7d3b0eecd98 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.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_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index e88665b5a34..8bdd7193d1a 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -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: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 86916c216a2..367d45e8525 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -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: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 23065b261c8..28b28aeb762 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -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: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index 3f58eaf698b..d78db14c30b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -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: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 18924ff6ac5..68e46fd120d 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.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_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 8056a150fc3..6acb2db4585 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.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_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 1b5ea5516d4..838f502bfdb 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -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: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index e61985c7dd1..f21099e9c5e 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -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: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index 7bf81b7fbe9..f771be5ef5a 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.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_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 1fb0d708dfa..0033bca36bc 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.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_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 6df43634ec4..8037c9cd7e5 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -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: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 7b6cbd91645..99234b6660f 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index 810781ed6d9..dca8e80f856 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index 2e89f083575..f3a58aa1433 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.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_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index fd656c736ef..98c56c37567 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -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: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 87f6416c6c5..100d9fe82b0 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -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: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- ============================================================================ CREATE LANGUAGE plpgsql; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 3e2e9b5bf13..b588fe56702 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -22,7 +22,7 @@ /** * \file htdocs/install/upgrade2.php * \brief Upgrade some data - * \version $Id: upgrade2.php,v 1.184 2011/07/28 10:55:45 eldy Exp $ + * \version $Id: upgrade2.php,v 1.186 2011/07/28 15:30:27 eldy Exp $ */ include_once('./inc.php'); @@ -3176,6 +3176,7 @@ function migrate_delete_old_files($db,$langs,$conf) DOL_DOCUMENT_ROOT.'/includes/modules/modProduit.class.php', DOL_DOCUMENT_ROOT.'/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php', DOL_DOCUMENT_ROOT.'/webcalendar/inc/triggers/interface_modWebcalendar_webcalsynchro.class.php', + DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modWebcalendar_Webcalsynchro.class.php', DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modCommande_Ecotax.class.php', DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modCommande_fraisport.class.php', DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modPropale_PropalWorkflow.class.php', @@ -3184,7 +3185,9 @@ function migrate_delete_old_files($db,$langs,$conf) DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/iphone_frontoffice.php', DOL_DOCUMENT_ROOT.'/includes/modules/mailings/dolibarr_services_expired.modules.php', DOL_DOCUMENT_ROOT.'/includes/modules/mailings/poire.modules.php', - DOL_DOCUMENT_ROOT.'/includes/modules/mailings/kiwi.modules.php' + DOL_DOCUMENT_ROOT.'/includes/modules/mailings/kiwi.modules.php', + DOL_DOCUMENT_ROOT.'/includes/modules/facture/pdf_crabe.modules.php', + DOL_DOCUMENT_ROOT.'/includes/modules/facture/pdf_oursin.modules.php' ); foreach ($filetodeletearray as $filetodelete) diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html new file mode 100644 index 00000000000..38e0f007a15 --- /dev/null +++ b/htdocs/langs/es_ES/html/gpl.html @@ -0,0 +1,330 @@ + + + + + + + + +H. Licencia Pública GNU + + + + + + + + + + + + + +

    Licencia Pública GNU

    + + + + +
    + +GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 + +
    + +

    Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, + MA 02139, USA.

    +

    Está permitido, a cualquier persona, copiar y distribuir copias tal cual de + este documento de licencia, sin la introducción de cualquier cambio. +

    + +
    +

    Introducción

    +

    Las licencias de muchos softwares se desarrollan para asegurar la libertad + de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, + al contrario, pretende garantizar la libertad de compartir y alterar softwares + de libre distribución - volviéndolos de libre distribución también para cualquier + de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares + de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla + (algunos softwares de la FSF son cubiertos por la GNU Library General Public + License).

    +

    Cuando nos referimos a softwares de libre distribución, nos referimos a la + libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar + la libertad de distribución de copias de softwares de libre distribución (y + cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos + fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se + hacen algunas restricciones, para asegurar los derechos de los programadores, + prohibiendo a todas las personas su negación o la solicitación de su abdicación. + Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución + o modificación del software.

    +

    Por ejemplo, al distribuirse copias de determinado programa, por una tasa + determinada o gratuitamente, se debe informar sobre todos los derechos incidentes + sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia + Pública General GNU.

    +

    La protección de los derechos envuelve dos pasos: (1) copyright del software + y (2) licencia que da permiso legal para copia, distribución y/o modificación + del softwares.

    +

    Aún para la protección de la FSF y del autor es importante que todos entiendan + que no hay garantías para softwares de libre distribución. Si software se modifica + por alguien y lo pasa adelante, este software no más reflejará el trabajo original + del autor no pudiendo, por consiguiente, ser garantizado por aquél.

    +

    Finalmente, cualquier programa de libre distribución está constantemente amenazado + por las patentes de softwares. Buscamos evitar el peligro de que distribuidores + de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. + Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación + de patente se debe hacer permitiendo el uso por cualquier individuo, sin la + necesidad de licencia de uso.

    +

    Los términos y condiciones precisas para copia, distribución y modificación + siguen abajo:

    +
    +

    Licencia Pública General GNU

    +

    TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN +

    + +
      + +

    1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga + un aviso colocado por el detentor de los derechos de autor diciendo que aquel + podrá ser distribuido en las condiciones de la Licencia Pública General. El + Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado + en un Programa y significa tanto el propio Programa, como cualquier de los + trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, + un trabajo que contenga el Programa o una parte de este, en su forma original + o con modificaciones o traducido para una otra lengua (la traducción está + incluida sin limitaciones en el término ``modificación'').

      +

      Actividades distintas de copia, distribución y modificación no están cubiertas + por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa + no está restringido y la salida del Programa está cubierta solamente en + el caso de que su contenido contenga trabajos basados en el Programa (independientemente + de que hayan sido creados por la ejecución del Programa). Si esto es así, + depende de las funciones ejecutadas por el Programa.

      2. + +

    2. El código fuente del Programa, de la forma como fue recibido, puede ser + copiado y distribuido, en cualquier media, desde que sea providenciado un + aviso adecuado sobre los copyrights y la negación de garantías, y todos los + avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, + estén inalterados y que cualquier producto oriundo del Programa esté acompañado + de esta Licencia Pública General.

      +

      Está permitido el cobro de tasas por el acto físico de transferencia o + grabación de copias, y pueden ser dadas garantías y soporte en cambio del + cobro de valores.

      3. + + +
    3. +

      Se puede modificar la copia o copias del Programa de cualquier forma que + se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir + tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

      + +
        +

      1. Debe existir un aviso destacado de que los datos originales fueron alterados + en los archivos y las fechas de los cambios;

        2. + +

      2. Debe existir un aviso de que el trabajo distribuido o publicado es, + de forma total o parcial, derivado del Programa o de alguna parte suya, + y que puede ser licenciado totalmente sin costes para terceros bajo los + términos de esta Licencia.

        3. + +

      3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, + en el inicio de tu ejecución, presentar la información de copyright y + de ausencia de garantías (o de que la garantía es de responsabilidad de + terceros), y que los usuarios pueden redistribuir el programa bajo estas + condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

        4. +
      + + Estos requisitos se aplican a trabajos de modificación en general. Si + algunas secciones identificables no sean derivadas del Programa, y pueden + ser consideradas como partes independientes, entonces esta Licencia y sus + Términos no se aplican a aquellas secciones cuando distribuidas separadamente. + Pero al distribuir aquellas secciones como parte de un trabajo basado en + el Programa, la distribución, como un todo, debe contener los términos de + esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no + a cada una de las partes independientemente de quem los tenga desarrollado. + Más que tener intención de contestar los derechos sobre el trabajo desarrollado + por alguien, esta sección objetiva propiciar la correcta distribución de + trabajos derivados del Programa. + Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado + en él ni a un trabajo basado en él, a un volumen de almacenaje o media de + distribución no obliga la utilización de esta Licencia y de sus términos + al trabajo. +
      4. + + +
    4. +

      Están permitidas, la copia y la distribución, del Programa (o un trabajo + basado en éste) en la forma de código objeto o ejecutable de acuerdo con los + términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

      + +
        +

      1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos + en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada + para manejo de softwares o

        +
        2. +

      2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, + de poner a disposición a terceros, por un coste no superior al coste del + medio físico de almacenaje, una copia completa de los códigos fuente en + medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

        +
        3. +

      3. Esté acompañada con la misma información recibida en relación con la + oferta de la distribución del código fuente correspondiente (esta alternativa + solamente está permitida para distribuciones no comerciales y solamente + si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, + de acuerdo con la sección 2 arriba).

        +
        4. +
      + El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones + en aquel trabajo. Cuando se habla en códigos fuentes completos significa + hablar de todos los fuentes de todos los módulos, además de las definiciones + de interfaces asociadas, archivos, scripts utilizados en la compilación + y instalación del ejecutable. Como una excepción excepcional, el código + fuente distribuido podrá no incluir algunos componentes que no se encuentren + en su escopo, como compilador, kernel, etc... para el SO donde el trabajo + sea ejecutado. + Si la distribución del ejecutable o objeto se hace, a través de acceso + a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente + de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos + con los objetos simultáneamente +
      5. + +
    5. +

      No está permitida la copia, modificación, sublicenciamiento o distribución + del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier + tentativa de copia, modificación, sublicenciamiento o distribución del Programa + está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. + Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, + no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas + de esta Licencia.

      6. +
    6. +

      No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá + documento o contrato que garantice permiso de modificación o distribución + del Programa o sus trabajos derivados. Estas acciones están prohibidas por + ley, en el caso de que no se acepten las condiciones de esta Licencia. La + modificación o distribución del Programa, o cualquier trabajo basado en éste, + implica en la aceptación de esta Licencia y de todos los términos de ésta + para copia, distribución o modificación del Programa o trabajos basados en + éste.

      7. +
    7. +

      Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), + el recipiente automáticamente recibe una licencia del detentor original de + los derechos de copia, distribución o modificación del Programa objeto de + estos términos y condiciones. No pueden ser impuestas otras restricciones + en los recipientes.

      8. + +
    8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes + o derechos de autor, se impongan restricciones, que contradigan esta Licencia, + estos no exentan de su aplicación. Si no es posible distribuir el Programa + de forma a garantizar simultáneamente las obligaciones de esta Licencia y + otras que sean necesarias, entonces el Programa no podrá ser distribuido. +

      Si esta Sección se considera, inválida por cualquier motivo particular + o general, su resultado implicará en la invalidación general de esta licencia + en la copia, modificación, sublicenciamiento o distribución del Programa + o trabajos basados en éste.

      +

      El propósito de esta sección no es, de forma alguna, incitar a quien quiera + que sea a infringir derechos reclamados en cuestiones válidas y procedentes, + y si proteger las premisas del sistema de libre distribución de software. + Muchas personas tienen hecho contribuciones generosas al sistema, en la + forma de programas, y es necesario garantizar la consistencia y credibilidad + del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución + de los softwares.

      +

      Esta sección pretende hacer claro los motivos que crearan las demás cláusulas + de estas Licencia.

      9. + +
    9. +

      Si la distribución del Programa, dentro de los términos de esta Licencia, + tiene restricciones en algún País, por patentes o derechos de autor, el detentor + original de los derechos de autor del Programa bajo esta Licencia puede adicionar + explícitamente limitaciones geográficas de distribución, excluyendo aquellos + Países, haciendo con que la distribución solamente sea posible en los Países + no excluidos.

      10. + +
    10. +

      La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) + puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública + General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos + objetivos y el espirito de la presente versión, pudiendo variar en detalles + referentes a nuevas situaciones encontradas.

      +

      A cada versión se da un número distinto. Si el Programa especifica, un + número de versión determinado de esta Licencia, que tenga en su contenido + la expresión ``o versión más actualizada'', es posible optar por las condiciones + de aquella versión o de cualquier versión más actualizada publicada por + la FSF.

      11. + +
    11. +

      Si deseas incorporar parte del Programa en otros programas de libre distribución + de softwares hace falta autorización formal del autor. Para softwares que + la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde + que mantenido el espirito y objetivos originales de esta Licencia.

      12. +
    + +

    AUSENCIA DE GARANTÍAS

    +
      +

    1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER + GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE + EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS + DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, + LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD + Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS + CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y + REPAROS JUZGADOS NECESARIOS.

      2. +

    2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR + LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN + RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE + HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS + O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES + O DAÑOS.

      +

      FIN DE LA LICENCIA

    + + +
    +

     

    +

    Apéndice

    +

    ¿Cómo aplicar estos términos a nuevos softwares?

    +

    Si has desarrollado un nuevo programa y deseas su amplia distribución para + el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, + que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

    +

    Para esto basta con anexar este aviso al programa. Se recomienda indicar aún + en el inicio de cada archivo fuente la ausencia de garantías y una anotación + de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

    +

    <nombre del programa y función> Copyright (C) 199X <Autor> +

    +

    Este programa es un software de libre distribución, que puede ser copiado + y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo + con la publicada por la Free Software Foundation, versión 2 de la licencia o + (a criterio del autor) cualquier versión posterior.

    +

    Este programa se distribuye en la expectativa de ser útil a sus usuarios, + pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE + ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General + 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. +

    +

    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:

    +

    Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares + NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software + de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. + Teclea 'muestra condic' para mayores detalles.

    +

    Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las + partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos + pueden variar o pueden ser accionados por otras interfaces como clic de ratón, + etc...

    +

     

    +
    +
    + +www.conectiva.com + +
    + + + + + diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt new file mode 100644 index 00000000000..3efbe1ccee7 --- /dev/null +++ b/htdocs/langs/nl_BE/html/gpl.txt @@ -0,0 +1,340 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +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 new file mode 100644 index 00000000000..778e2b02b41 --- /dev/null +++ b/htdocs/langs/nl_NL/html/gpl.txt @@ -0,0 +1,339 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van +deze licentie. \ No newline at end of file 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/ajax.lib.php b/htdocs/lib/ajax.lib.php index 55def736688..7db1908bc49 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ */ diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index e2a33296bee..263e18df269 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -16,7 +16,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ @@ -24,7 +25,7 @@ * \file htdocs/lib/pdf.lib.php * \brief Set of functions used for PDF generation * \ingroup core - * \version $Id: pdf.lib.php,v 1.99 2011/07/31 23:25:42 eldy Exp $ + * \version $Id: pdf.lib.php,v 1.98 2011/07/27 17:28:42 eldy Exp $ */ diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1bdeb9562e6..49b67f9349a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index eedd6a8841c..03ef2767e40 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -21,7 +21,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -29,7 +30,7 @@ * \ingroup core * \brief File that defines environment for all Dolibarr process (pages or scripts) * This script reads the conf file, init $lang, $db and and empty $user - * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ + * \version $Id: master.inc.php,v 1.350 2011/07/30 10:23:24 eldy Exp $ */ @@ -70,14 +71,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root['alt']=$value; + $conf->file->dol_document_root[]=$value; } } diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index d6bf7267439..454073d9730 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 6e1e7b262f4..b5304ba4198 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index b0a7c2dece6..bda35165079 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.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/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ + * \version $Id$ */ if (session_id() == "") session_start(); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 8bccf934120..1da2adb751e 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ + * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index efbd289cb3f..a65f888ab11 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ + * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ */ require("../main.inc.php"); @@ -1645,6 +1646,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 8f373b577e8..79601ea1031 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 724900dc500..8cf57ec0b64 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ + * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ */ require("../main.inc.php"); @@ -271,5 +272,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); +llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); ?> diff --git a/htdocs/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/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 013e493ec49..78ca25e85a6 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \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.91 2011/07/28 20:54:02 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1101,7 +1101,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/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index e78dff8f646..f93935ffb16 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.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/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ + * \version $Id$ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal 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 $'); ?> From 52f7ff7880f63d144892c4f355755b1b033a9508 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:22:37 +0000 Subject: [PATCH 002/118] Fix: Avoid errors into rpm packages --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/control.DEBIAN | 46 ----- build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 + build/deb/install | 1 + build/deb/po/fr.po | 22 ++- build/deb/po/templates.pot | 20 ++- build/deb/postinst | 100 ++++++----- build/deb/postrm | 119 +++++++------ build/deb/templates | 7 + build/makepack-dolibarr.pl | 163 ++++++++++-------- 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 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 35 +++- htdocs/admin/perms.php | 34 +++- htdocs/boxes.php | 6 +- htdocs/cashdesk/tpl/menu.tpl.php | 13 +- htdocs/cashdesk/tpl/validation1.tpl.php | 21 ++- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/core/class/conf.class.php | 9 +- htdocs/core/class/cookie.class.php | 5 +- htdocs/core/class/html.form.class.php | 11 +- htdocs/core/class/interfaces.class.php | 5 +- htdocs/filefunc.inc.php | 7 +- htdocs/imports/import.php | 7 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- htdocs/index.php | 7 +- htdocs/install/check.php | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 5 +- .../mysql/data/llx_20_c_departements.sql | 5 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- .../install/mysql/data/llx_c_currencies.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/data/llx_c_tva.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_departements.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_regions.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- htdocs/install/mysql/tables/llx_commande.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../mysql/tables/llx_commande_fournisseur.sql | 5 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../tables/llx_product_fournisseur.key.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/install/upgrade2.php | 5 +- htdocs/lib/admin.lib.php | 77 +++++++-- htdocs/lib/ajax.lib.php | 5 +- htdocs/lib/pdf.lib.php | 5 +- htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 9 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- htdocs/societe/soc.php | 10 +- htdocs/theme/auguria/style.css.php | 5 +- 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 +- 337 files changed, 1220 insertions(+), 1335 deletions(-) delete mode 100755 build/deb/control.DEBIAN diff --git a/build/deb/README b/build/deb/README index edb46ffd5a3..d73d7a99219 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build package +# dpkg -b To build binary only package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# +# dpkg-reconfigure -plow package Reconfigure package # dpkg -L packagename List content of installed package +# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index b035f18ae1d..3382966714b 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 + -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN deleted file mode 100755 index 7c66775bdf1..00000000000 --- a/build/deb/control.DEBIAN +++ /dev/null @@ -1,46 +0,0 @@ -Package: dolibarr -Version: __VERSION__ -Architecture: all -Maintainer: Laurent Destailleur -Installed-Size: 61200 -Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl -Section: web -Priority: optional -Homepage: http://www.dolibarr.org -Description: Easy to use web based ERP & CRM software - Dolibarr ERP & CRM is an easy to use open source/free software for small - and medium companies, foundations or freelances. It includes different - features for Enterprise Resource Planning (ERP) and Customer Relationship - Management (CRM) but also for different other activities. - It's a web software you can install as a standalone program or on any web - hosting provider to use it from anywhere with any web browser. - Dolibarr was designed to provide only features you need and be easy to use. - . - Only features you need are visible, depending on which module were activated. - Most common used modules are: - . - Customers, Suppliers or Prospects directory, - Contacts directory, - Orders management, - Commercial proposals management, - Invoices management, - Products and services catalog, - Stock management, - Foundations members management, - Bank accounts management, - Point of Sale, - Payments management, - Commercial actions management, - Contracts management, - Standing orders management, - Shipping management, - Donations management, - Bookmarks management, - Mass Emailings, - Reports, - Wizards to export and import data, - LDAP connectivity, - PDF exports, - And a lot of more modules... - . - You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index 91f0705c001..e28258d8dbc 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,10 +4,16 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper, po-debconf +Build-Depends: debhelper (>= 7), po-debconf Package: dolibarr -Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, + php5-mysql | php5-mysqli, + php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, + ${misc:Depends}, xdg-utils, + mysql-server, perl +Recommends: apache2 | lighttpd | httpd, mysql-client +Suggests: www-browser Architecture: all Section: web Priority: optional diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index a48e5048dff..f4b471edf13 100644 --- a/build/deb/dolibarr.desktop +++ b/build/deb/dolibarr.desktop @@ -3,10 +3,14 @@ # It must be saved into directory /usr/share/applications Version=1.0 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM +Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations +Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/deb/install b/build/deb/install index 4d41fd52c65..2928d378abc 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,4 +1,5 @@ etc/dolibarr/apache.conf +etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 13b8030ed0d..3bbe762283a 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:49+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,10 +25,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "Seveur web à reconfigurer automatiquement:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" +"Selectionnez le serveur web à configurer automatiquement pour utiliser " +"dolibarr." + # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -36,7 +52,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index 32c92a97cc4..d65e5d8b7f6 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:52+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,15 +17,29 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: multiselect #. Description #: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:2001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index ca5fd1645dd..e0bba1be4da 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,7 +1,5 @@ #!/bin/sh # postinst script for dolibarr -# -# see: dh_installdeb(1) set -e @@ -16,6 +14,31 @@ set -e # for details, see /usr/share/doc/packaging-manual/ + + +lighttpd_install() { + if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + if which lighty-enable-mod >/dev/null 2>&1 ; then + echo "Add link for Lighttpd config file" + ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf + # We enabled it + lighty-enable-mod dolibarr fastcgi-php + else + echo "Lighttpd not installed, skipping" + fi + fi +} + +apache_install() { + webserver=$1 + if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Add link for Apache config file" + ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + . /usr/share/debconf/confmodule db_version 2.0 @@ -27,8 +50,6 @@ 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" @@ -44,10 +65,6 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir - # Copy apache.conf file into target directory - #mkdir -p /etc/dolibarr - #cp -p $apachefileorig $apacheconfig - # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -74,21 +91,15 @@ case "$1" in chmod -R 660 $config fi - # Get the web server type (use db_get for interactive mode). - #db_reset "dolibarr/webserver" - #db_get "dolibarr/webserver" # Read value for webserver. - #webserver="$RET" - - case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; - esac - + + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + # Set up web server. - for server in $webservers ; do - echo Complete config of server $server + for webserver in $webservers ; do + webserver=${webserver%,} + echo Complete config of server $webserver # Detect webuser and webgroup webuser= @@ -106,26 +117,31 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config - - # Add link to config file - echo Setup web server $server to add dolibarr config file - ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf - done - # Restart servers - servers="apache2-ssl apache2 mysql" - # Another way to restart - for server in $servers ; do - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $server reload || true - else - echo Restart web server $server using $server reload - /etc/init.d/$server reload || true - fi + # Restart web server. + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_install + else + apache_install $webserver + fi + # Reload webserver in any case, configuration might have changed + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $webserver reload 3>/dev/null || true + else + echo Restart web server $server using $server reload + /etc/init.d/$webserver reload 3>/dev/null || true + fi + fi done + echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -136,13 +152,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument $1" >&2 exit 0 ;; esac -db_stop - #DEBHELPER# +db_stop + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 9eae81b022b..27ce3777b7e 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,7 +17,36 @@ set -e # for details, see /usr/share/doc/packaging-manual/ -. /usr/share/debconf/confmodule + +lighttpd_remove() { + if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + echo "Remove link for Lighttpd config file" + rm -f /etc/lighttpd/conf-available/50-dolibarr.conf + if which lighty-enable-mod >/dev/null 2>&1 ; then + lighty-disable-mod dolibarr + else + echo "Lighttpd not installed, skipping" + fi + # See bug #448682 + if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then + echo 'Manually deleting lighttpd/dolibarr configuration link' + rm /etc/lighttpd/conf-enabled/50-dolibarr.conf + fi + fi +} + +apache_remove() { + if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Remove link for Apache config file" + rm -f /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi db_version 2.0 @@ -26,63 +55,62 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' -apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" -apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" -export webserver="" -# Allows us to loop and substitute in one pass -case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; -esac - case "$1" in # Call when we upgrade upgrade) + echo "postrm upgrade" ;; # Call when we uninstall remove) + echo "postrm remove" rm -f $lockfile - # 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" + # Reconfigure web server + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + + # Restart web servers + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_remove + else + apache_remove $webserver + fi + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload 3>/dev/null || true + else + /etc/init.d/$webserver reload 3>/dev/null || true + fi fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" + echo "postrm purge" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical "dolibarr/postrm" || true + db_input critical dolibarr/postrm || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get "dolibarr/postrm" + db_get dolibarr/postrm set -e if [ "$RET" = "true" ] ; then @@ -185,41 +213,12 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi - # Remove include files - export restart="" - for server in $webservers ; do - export conffile="/etc/$server/conf.d/dolibarr.conf" - if [ -f $conffile ] ; - then - echo Delete file $conffile - rm -f $conffile - status=purge - fi - - if [ "x$status" = "xpurge" ] ; - then restart="$restart $server" - fi - done - rm -rf /etc/dolibarr - # Restart servers - for server in $restart ; do - # We disable blocking errors - set +e - echo "Restart server $server if exists" - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $server reload || true - else - /etc/init.d/$server reload || true - fi - # We restore blocking errors - set -e - done - # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset "dolibarr/postrm" + db_reset dolibarr/reconfigure-webserver + db_reset dolibarr/postrm set -e #db_purge @@ -229,7 +228,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "postrm called with unknown argument $1" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index 5c06afd8ccd..b96325a4e64 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,3 +1,10 @@ +Template: dolibarr/reconfigure-webserver +Type: multiselect +Choices: apache2, lighttpd +_Description: Web server to reconfigure automatically: + Please choose the web server that should be automatically configured + to run dolibarr. + Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index d3c47e6b28d..f1527da165b 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.130 2011/08/03 00:47:37 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -306,18 +306,23 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; - #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; - #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; } # Build package for each target @@ -440,57 +445,61 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$FILENAMETGZ2"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; + print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n"; + $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\""; $ret=`$cmd`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; # Apache conf files - #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; - #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + $ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`; # Dolibarr conf files # TODO @@ -515,21 +524,21 @@ if ($nboftargetok) { $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; # Build tgz @@ -566,9 +575,11 @@ if ($nboftargetok) { next; } - + if ($target eq 'DEB') { + $olddir=getcwd(); + $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -603,7 +614,7 @@ if ($nboftargetok) { $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; - open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; + open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -657,6 +668,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`; @@ -671,19 +683,22 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache conf files + # Apache and lighttpd conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - - # Dolibarr conf files - # TODO + print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -729,17 +744,15 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - print "Go to directory $BUILDROOT\n"; - $olddir=getcwd(); - chdir("$BUILDROOT"); - - # Creation of binary package (to build without sources) + # Creation of binary package (to build without sources) + #print "Go to directory $BUILDROOT\n"; + #chdir("$BUILDROOT"); #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Creation of source package + # Prepare source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -751,6 +764,7 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; + $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -766,6 +780,9 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; + + # Creation of source package + print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/build/rpm/README b/build/rpm/README index 99a1bb3552c..f20bf91db72 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -5,17 +5,24 @@ RPM Package tools This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, -with format RPM (for Redhat, Mandriva, ...). +with format RPM (for Redhat, OpenSuse, Mandriva, ...). -# This is standard command to work on Debian packaging: +# This is standard command to work on RPM packaging: +# +# yum -y install rpmlint +# yum -y install hunspell-en hunspell-es hunspell-fr hunspell-it # # rpmlint file.rpm Test a package +# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm # # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies -# yum erase dolibarr To remove package +# yum erase dolibarr To remove package +# chcon -R -h -t httpd_sys_script_rw_t /file To add temporary context rw for httpd on /file +# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" To add persistent context rw for httpd on /dir (this add file_contexts.local) +# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage) # # On OpenSuse # yast --install dolibarr-...rpm To install package and dependencies diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index 4b4fb60dadb..337b92d8049 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -4,13 +4,14 @@ Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti -Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 708546cf263..08fe933d774 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -5,6 +5,11 @@ # file to build a package for your own distributions and # edit it if you need to match your rules. # -------------------------------------------------------- + +#%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0) +#%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) +#%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0) + %define name dolibarr %define version __VERSION__ %define release __RELEASE__ @@ -12,9 +17,12 @@ Name: %{name} Version: %{version} Release: %{release} -Summary: Dolibarr +Summary: ERP and CRM software for small and medium companies or foundations +Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos +Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations +Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti -License: GPL +License: GPLv2+ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team @@ -56,13 +64,12 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Un software ERP y CRM open source/gratis para pequeñas y -medianas empresas, asociaciones o autónomos. Incluye diferentes -funcionalidades para la Planificación de Recursos Empresariales (ERP) y -Gestión de la Relación con los Clientes (CRM) así como para para otras -diferentes actividades. Dolibarr ha sido diseñado para suministrarle -solamente las funcionalidades que necesita y haciendo hincapié en su -facilidad de uso. +Un software ERP y CRM para pequeñas y medianas empresas, asociaciones +o autónomos. Incluye diferentes funcionalidades para la Planificación +de Recursos Empresariales (ERP) y Gestión de la Relación con los +Clientes (CRM) así como para para otras diferentes actividades. +Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades +que necesita y haciendo hincapié en su facilidad de uso. %description -l fr Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, @@ -71,12 +78,12 @@ fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Un programma gestionale open source e gratuito per piccole e medie +Un programmo gestionale per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori -attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno +attività. Progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. -Dolibar è completamente web-based, progettato per poter fornire solo ciò di +Programmo web, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. @@ -94,49 +101,51 @@ echo Building %{name}-%{version}-%{release} #---- install %install -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr +%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf +%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr # %{_datadir} = /usr/share -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +%{__install} -m 644 var/www/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications +%{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README -install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/doc $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/htdocs $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT #---- clean %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT #---- files %files + %defattr(-,root,root) -%doc README -%doc COPYRIGHT %doc /var/www/dolibarr/doc/* %dir /var/www/dolibarr/build %dir /var/www/dolibarr/htdocs %dir /var/www/dolibarr/scripts -%_datadir/pixmaps/* +%_datadir/pixmaps/dolibarr.png %_datadir/applications/%{name}.desktop /var/www/dolibarr/build/* /var/www/dolibarr/htdocs/* /var/www/dolibarr/scripts/* -/var/www/dolibarr/README -/var/www/dolibarr/COPYRIGHT -#%config /var/www/dolibarr/htdocs/conf/conf.php + +%defattr(0664, -, -, 0755) +%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf +%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr #---- post (after unzip during install) @@ -154,11 +163,11 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr" +export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="/usr/share/dolibarr/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="/usr/share/dolibarr/install.lock" # Detect OS @@ -192,8 +201,8 @@ echo OS detected: $os # Create empty directory for uploaded files and generated documents echo Create document directory $docdir -mkdir -p $docdir -mkdir -p %{_sysconfdir}/dolibarr +%{__mkdir} -p $docdir +%{__mkdir} -p %{_sysconfdir}/dolibarr # Create install.forced.php into Dolibarr install directory superuserlogin='' @@ -205,12 +214,12 @@ if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then fi echo Mysql superuser found to use is $superuserlogin if [ -z "$superuserlogin" ] ; then - cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig + %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig else - cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig + %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig fi -chown -R root:$apachegroup $installconfig -chmod -R 660 $installconfig +%{__chown} -R root:$apachegroup $installconfig +%{__chmod} -R 660 $installconfig # Create an empty conf.php with permission to web server if [ ! -f $config ] @@ -222,19 +231,20 @@ then fi # Create config file for apache $apacheconfig -if [ ! -f $apacheconfig ]; then - echo Create dolibarr web server config file $apacheconfig - cp $apachefileorig $apacheconfig - chmod a-x $apacheconfig - chmod go-w $apacheconfig -fi - -# Create config file for se $seconfig -if [ ! -f $seconfig ]; then - echo Create se config file $seconfig - cp $sefileorig $seconfig +#if [ ! -f $apacheconfig ]; then +# echo Create dolibarr web server config file $apacheconfig +# cp $apachefileorig $apacheconfig # chmod a-x $apacheconfig # chmod go-w $apacheconfig +#fi + +# Create config file for se $seconfig +if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then + echo Add SE Linux permission from file $sefileorig +# cp $sefileorig $seconfig + restorecon -R -v /etc/dolibarr + restorecon -R -v /var/www/dolibarr + restorecon -R -v /usr/share/dolibarr fi # Create a config link dolibarr.conf @@ -253,18 +263,6 @@ echo Set permission to $apacheuser:$apachegroup on $docdir chown -R $apacheuser:$apachegroup $docdir chmod -R o-w $docdir -# Set SE Linux on OS SE is enabled -if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then - echo Set SELinux permissions - # Warning: chcon seems not cumulative - #chcon -R -h -t httpd_sys_content_t $targetdir - #chcon -R -h -t httpd_sys_content_t $docdir - chcon -R -h -t httpd_sys_script_rw_t $targetdir - chcon -R -h -t httpd_sys_script_rw_t $docdir - chcon -R -h -t httpd_sys_script_rw_t %{_sysconfdir}/dolibarr - #chcon -R -h -t httpd_sys_script_exec_t $targetdir -fi - # Restart web server echo Restart web server if [ -f %{_sysconfdir}/init.d/httpd ]; then @@ -274,6 +272,12 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then %{_sysconfdir}/init.d/apache2 restart fi +# Restart mysql +echo Restart mysql +if [ -f /etc/init.d/mysqld ]; then + /etc/init.d/mysqld restart +fi + # Show result echo echo "----- Dolibarr %version - (c) Dolibarr dev team -----" @@ -301,9 +305,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="$targetdir/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="$targetdir/install.lock" # Detect OS @@ -338,7 +342,7 @@ echo OS detected: $os if [ -f $apachelink ] ; then echo Delete apache config link for Dolibarr - rm -f $apachelink + %{__rm} -f $apachelink status=purge fi @@ -356,18 +360,15 @@ then fi # Removed dirs after apache restart -echo Removed remaining $apacheconfig -rm -f $apacheconfig echo Removed remaining $config -rm -f $config +%{__rm} -f $config echo Removed remaining $installconfig -rm -f $installconfig +%{__rm} -f $installconfig echo Removed remaining $lockfile -rm -f $lockfile +%{__rm} -f $lockfile echo Removed remaining dir $targetdir/doc rmdir $targetdir/doc >/dev/null 2>&1 -#echo Removed remaining dir $targetdir/htdocs -#rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm + %changelog * Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 diff --git a/build/rpm/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr index 64376e5afb6..193a43b7dbe 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -1,3 +1,3 @@ -/etc/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/var/www/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file +/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/var/www/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 3cc548e1c0a..d7172d651f0 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -27,7 +27,7 @@ * \file htdocs/includes/modules/modMyModule.class.php * \ingroup mymodule * \brief Description and activation file for module MyModule - * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $ + * \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); @@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='generic'; - // Defined if the directory /mymodule/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 718c842d046..34e7f48cea8 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -20,7 +20,7 @@ /** * \file htdocs/admin/boxes.php * \brief Page to setup boxes - * \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $ */ require("../main.inc.php"); @@ -278,7 +278,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -394,7 +394,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -470,5 +470,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $'); +llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $'); ?> diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index a907f47663a..671bd69a0e4 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2010 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ /** * \file htdocs/admin/modules.php * \brief Page to activate/disable all modules - * \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $ */ require("../main.inc.php"); @@ -79,12 +79,35 @@ $modules = array(); $orders = array(); $categ = array(); $dirmod = array(); +$modulesdir = array(); $i = 0; // is a sequencer of modules found $j = 0; // j is module number. Automatically affected if module number not defined. -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $althandle=@opendir($dirroot); + if (is_resource($althandle)) + { + while (($file = readdir($althandle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
    "; dol_syslog("Scan directory ".$dir." for modules"); @@ -449,5 +472,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $'); +llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $'); ?> diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index bee00b52906..6af9b54e7f0 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -21,7 +21,7 @@ * \file htdocs/admin/perms.php * \ingroup core * \brief Page d'administration/configuration des permissions par defaut - * \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $ + * \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $ */ require("../main.inc.php"); @@ -76,10 +76,34 @@ $db->begin(); // Charge les modules soumis a permissions $modules = array(); -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +$modulesdir = array(); +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
    "; $handle=@opendir($dir); @@ -194,5 +218,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $'); +llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $'); ?> diff --git a/htdocs/boxes.php b/htdocs/boxes.php index 2affdf654d3..d426e618377 100644 --- a/htdocs/boxes.php +++ b/htdocs/boxes.php @@ -22,7 +22,7 @@ * \brief File of class to manage widget boxes * \author Rodolphe Qiedeville * \author Laurent Destailleur - * \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $ */ @@ -220,7 +220,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php"); + $sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); } else { @@ -281,7 +281,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 83dac68a99e..8b82c9f8249 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); @@ -63,11 +62,13 @@ $logout=''; print '
      '; +// Link to new sell print '
    • '.$langs->trans("NewSell").'
      • '; - -print '
    • '.$langs->trans("BackOffice").'
      • '; - -print '
    • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' '.$logout.'
      '; +// Open new tab on backoffice (this is not a disconnect from POS) +print '
    • '.$langs->trans("BackOffice").'
      • '; +// Disconnect +print '
    • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom']; +print ' '.$logout.'
      '; print $langs->trans("CashDeskThirdParty").': '.$companyLink.'
      '; /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'
      '; print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'
      '; diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index f3a440b4929..b18bf124ae4 100644 --- a/htdocs/cashdesk/tpl/validation1.tpl.php +++ b/htdocs/cashdesk/tpl/validation1.tpl.php @@ -15,8 +15,7 @@ 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, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with this program. If not, see . -->
      trans("Summary"); ?> @@ -40,9 +39,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ?> trans("TotalTTC"); ?> prix_total_ttc(),'MT').' '.$conf->monnaie; ?> trans("PaymentMode"); ?> - mode_reglement()) - { + { case 'ESP': echo $langs->trans("Cash"); $filtre='courant=2'; @@ -53,7 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 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"); @@ -65,16 +64,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. echo $langs->trans("Reported"); $filtre='courant=1 OR courant=2'; $selected=''; - break; + break; default: $filtre='courant=1 OR courant=2'; $selected=''; } - + ?> - - mode_reglement() == 'DIF' ) { @@ -100,10 +99,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

      - 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/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 259dc4dbce5..96de90124f9 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -48,7 +47,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -67,7 +66,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -78,17 +77,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index e05eaa66ecf..0efb704828f 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ + * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -1032,5 +1031,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index d2f2a7aae7e..5da397b4183 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ + * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ */ require('../main.inc.php'); @@ -673,5 +672,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); +llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index e6559c2ae2e..c5664164e74 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -16,8 +16,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -25,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $ + * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ */ @@ -145,13 +144,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard + $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard + $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/'; } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php index 07fed567b48..c21450bb8cb 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ + * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index cb4a0f7a5cf..e24b3c7c717 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -23,15 +23,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $ + * \version $Id: html.form.class.php,v 1.193 2011/07/31 23:45:14 eldy Exp $ */ @@ -161,8 +160,10 @@ class Form $htmltext=str_replace("\n","",$htmltext); $htmltext=str_replace('"',""",$htmltext); - $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip - $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip + else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip + else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag $s=""; if (empty($notabs)) $s.=''; diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 8deeda0fb57..2ca2f82789e 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/interfaces.class.php * \ingroup core * \brief Fichier de la classe de gestion des triggers - * \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $ + * \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $ */ diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 13a97bf54b3..3148174f5af 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,15 +20,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -65,7 +64,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index c03b55d2347..97d4d8252d3 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ + * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ */ require_once("../main.inc.php"); @@ -1669,7 +1668,7 @@ print '
      '; $db->close(); -llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); +llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); /* diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php index 42780551928..c7bab37ad4b 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.10 2011/07/31 23:28:10 eldy Exp $ + * \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis 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/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 1; // Data directories to create when module is enabled diff --git a/htdocs/index.php b/htdocs/index.php index 5998094d362..f027e94a35a 100644 --- a/htdocs/index.php +++ b/htdocs/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/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -574,7 +573,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); +llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 3724ef23d95..9b19d9793fc 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 20ef1080e85..737e16cc10c 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 5d7fca530f2..c9713870c22 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index d7df4ac6929..e7b45a476f1 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 9a0dd0fcc43..62e0a4a90cf 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 0037190af06..50fa9904890 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ + * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 6d19b01e197..2e0fccb0051 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 3050d37833c..223a2eb6d92 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -75,10 +74,12 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +$lockfile = '../../install.lock'; +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; - +#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here +$lockfile = '../../install.lock'; if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -178,7 +179,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists('../../install.lock')) +if (file_exists($lockfile)) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
      '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index c786f91346c..841136fff8b 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 9d08a56e41c..275298588e2 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 1f046a29bc4..8ea28cbbcc3 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.14 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 9a109ab3fdc..4be9b6b7719 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.16 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index 56ceea3d807..da244f79951 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index 3a248c2f49f..eee5dfa185a 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index dcbaf2faaf4..e3922b97f65 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index 1dd3cb59a62..b7f6c71c87e 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,10 +11,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index 5e93e39d048..f3299990858 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index e3ed8196d17..1f14cc8c142 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 176e5c796e2..5017ce0c60d 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql index ad7c175fcc4..eeb2c376b85 100644 --- a/htdocs/install/mysql/data/llx_c_currencies.sql +++ b/htdocs/install/mysql/data/llx_c_currencies.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_c_currencies.sql,v 1.8 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index db630463dbf..f58db2b32a6 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index c67d263853d..079caa7dde4 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 07fa2abaa83..4bb81528e74 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index e29b3f306f5..720413ac480 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index c7fa6b6dd1f..cb0b557b438 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index 6a597996424..a3a19cc2125 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 78e174b9817..1ec498e6bc2 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a535a5098e..3a17978bb0c 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index f6395abbfcd..96d456312df 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 9c28f697f83..488b0a564eb 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index 988d9c26136..d8701c52c01 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ -- -- @@ -34,4 +33,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2d1a3c62a39..2fd47385a90 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 056dbdbdb6e..788e9e82f39 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_c_tva.sql,v 1.27 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index 4238000eb14..da98640fd25 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 6e596be24e5..789ad16fce2 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index e2faed3cba3..48b77951e1f 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index cf7e9e96275..59bd3d1ef00 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index 655848a50ae..cd2f27a5dca 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 968a131e2bb..42f86f1c447 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 6e6e960072b..685170362fd 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 02ff06ba9f1..921bc569980 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index f22262c9353..d5902b539c7 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index b2cdf08af5f..ddd3d734ff7 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 031bfb614e1..8c5c23bbe62 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index 3aa9555979e..f7b876eed86 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 4703aa32ddd..8d34e2a9c78 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index 69bf706ca68..ad6f448e3dc 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 9156b439833..51d66c04584 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index db64e0cbf9c..7df7f21a3b9 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index a7efcbd0f6d..31676d7d6e2 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index 7e4fa074e71..bc9d9ad0936 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index d23a1367f92..18eed730ab8 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index 2b2db5af657..ade41da746e 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index b5c9175202b..62a88236480 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 6ed1e00dd88..015a9e9b4c0 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index d1279c21eb2..296b49fc93f 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 822a69bc4ec..9cedf70e7ca 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index aba765190ee..55718d8ffb5 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index eded16c49fe..abc9baa2d8c 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index e39fbf71f12..3dd83585bcd 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 3710a87470a..217edcaddbb 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index ad41449f288..5869f24d8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index f6301a24919..5db17f19069 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index cd68a9cdb40..5f66ff625f0 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index 890c7597862..b0546729ef0 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index d67cf7fe4b8..4794113f8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5c06c73c69d..5fc25f57339 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 115bd310d70..5746cce26aa 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index d3c71cc4a70..ba1e56e2b94 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index 10c4cc2d853..de9c23e9c05 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,11 +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, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- --- $Id$ +-- $Id: llx_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index 09365976d78..cce9d04707b 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 463b1235094..93e8e3d99a7 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index c81a2b3e830..b0f31fe7116 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index 821fe3e5c04..cb2251cfaf6 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 9380607010d..8bebcf13116 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index e524d9c937a..b30354cae19 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index 0b0b34390c4..b026a40d762 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 7b5fa661d7d..39d21cee7b9 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 66cd5111325..60af7723f30 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index ebca12ab5da..cb223ae5532 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 3872bedd39d..415b8526793 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index bed4ad41dfc..5c54695f608 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 23cd0f575ed..93ef5d59770 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index f46d2a56c33..7702a8cf21e 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_departements.sql b/htdocs/install/mysql/tables/llx_c_departements.sql index ab0ea5dc0c3..ea1f7543428 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_departements.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ +-- $Id: llx_c_departements.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_c_departements diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 4669de108f4..46a35567e95 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index a6bb8ca70f7..c2c43a3a625 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 5637e5a987d..547500d7f33 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index 884d8274cfd..bf7ed18af80 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index 2b6dea6cbd3..d0dceaf0fe1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 76aecebbb9a..192183be0c1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index 665a210d74b..d6d673962b9 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index 7fcd57e31eb..c8deefef6d7 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index e1cab3b3368..757653f1fc2 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f97e458be6b..f2fb7fda4d3 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 165a8550331..7a228ec1572 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 6efa388ef81..120e27ae77d 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index c8824b2d04e..a5e3fd8721b 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 311183c87f4..418e37a85b1 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 2d00f620e02..1cc5dbfaf0e 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 02052920c8a..84c72e0839b 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 0f608cbc171..8cf0ec900f8 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 75b40946559..2eed307bc54 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql index d9d0f2d1b0c..5ef6fb221e6 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_regions.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ +-- $Id: llx_c_regions.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_c_regions diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index 76caf44356d..c977dd9dd21 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 861671e3607..8307ca88eb6 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 46504e8a1c4..9a7bda88c28 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index dc284fc8cea..725ddbfeb90 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index 4f8736a3a14..a1feeb33f8b 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -13,8 +13,7 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -24,7 +23,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 85ea592d950..1e141b7768a 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 9fad6cc333e..79d54faf623 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index d6bd27758b4..97638937c74 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 40759cdc50b..211af70a854 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 80e73c43399..7c4c534451d 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index 4c466e0c02b..f2330322a5f 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 46a39b3c9e7..8e4492c28a9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 60641bf1876..39be52cf374 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index cfe126b5adf..e93ce9b4354 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index 7e12e06beb7..baa01289b96 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index 83eb804c875..bd19d25f1a5 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index 6236e113766..eb95b9fe66c 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index cf5121c34f9..2c95fde3255 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index cabdcce3a80..d62011351c4 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index ebaf9582414..a07ff049d61 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index fa9a85aac1f..730bc11ac98 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index ec8931763bf..6f129f2feec 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 9c6e2a065f8..731cf8fb0f4 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_commande.sql,v 1.13 2011/07/28 22:22:31 eldy Exp $ +-- $Id: llx_commande.sql,v 1.14 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_commande diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 7958b56f354..172a2432ee1 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ --- Supprimme orphelins pour permettre monte de la cl +-- Supprimme orphelins pour permettre mont�e de la cl� -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index 3ef51d6ae21..f1c8c7ac579 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_commande_fournisseur.sql,v 1.7 2011/07/28 22:22:31 eldy Exp $ +-- $Id: llx_commande_fournisseur.sql,v 1.8 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index 3f848c9ffe2..c13c0aa6019 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index df6d49827f6..f0c65456e5c 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index 9bb45f9d326..be4e60a9a97 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 91914ab66c7..23cfd068495 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b39863cab..d1b18165255 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index e964fbc2f5e..19ec675f973 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a747c714fb3..a53a24d9a66 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 16ecb365d6c..46639ca7c1e 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index bfce896eb19..d1ba0645e05 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index 51234007ee1..b7fc52403af 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index eead2907fa2..4187f526393 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 1c757fa6c86..7b74d8b506d 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ --- Supprimme orhpelins pour permettre monte de la cl +-- Supprimme orhpelins pour permettre mont�e de la cl� -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index 79b52ba399c..f1f4a75b604 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 3757e4522bf..39b89773316 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index f5987250001..98b29b1f715 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 9c4a5e340ab..0eb566317d0 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 906d0a3e2f4..3fb9f7d6d2d 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index 20bb329ff0e..ba595100b5f 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index 2063a310fb8..b71d2697b85 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index a99b42859c7..61d63046fac 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index f0e0a065089..0e20201f4cb 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 06af8a78575..154f0b51006 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1c5d5c30173..1dc4941012a 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index e43f4cb118c..a208aa5fff0 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index e4eb41f3bb4..f60029ee290 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 463675b10b7..2833920b746 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index fc998bd6edb..7987ca819c1 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index 1e9b0495d34..e027d471e23 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ +-- $Id: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index b899c4303e1..8b279dc578b 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 5d6d86617e6..684c5aa5a7c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index 6de1b23eb64..cdccf3eb6ec 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index 04491e0878c..fee45753759 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 575930a728c..9401f679071 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 46b769b8afc..757e8d2b447 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index e1b82141ea1..d0118ebdc6c 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 19824c860de..57d92bc8ce9 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 455916a3010..6f2ddcf56b9 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 94e726796c5..6cf13137710 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index 8dbbb572f29..cee3ace0ec3 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 923c2441987..34d0bbac03b 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index 88cf83a3cc3..ef97e48a251 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index 68e21d26061..b674a0cf11d 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index f289b9cb514..5e3620cba87 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index a2e54d34770..bd3c0c7d780 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index dbeec277f88..1524eb7a77b 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index e3e5900fb74..75a4ce8fd06 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index 0669065b7d3..eafe6bd31e1 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index dcca0174817..6a06c0c70b5 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index 99cf1edd744..d4aa4b26d99 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index 415b44c6a35..b55d734674f 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index ba8b40b3c0a..22a5b9d5c52 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 40e131fefdf..5edbea4808d 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index bc11ca42c8f..5313952606a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index 8d4a4ecdcbf..c210f906b9b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index f43ab1e746a..29598bb4963 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index a52d3ed4a8b..cfaad1061df 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 4e9f0d1da0e..521d666742d 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index c9891219f4f..29af17f7c08 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 6b8f7176dee..917d6fc5cdf 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 399dd175311..87245438b4d 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index c06074d4709..373267c8921 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index 1e3f21d0eb7..b67427b9de8 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 08450aa204f..8f00ee95200 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index 9b0104ccfe5..edc76a392b0 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 0782e089170..302248ae299 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 68b6cd9a315..9c741080a27 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 177be65fb88..4dd0ae15ad4 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index d573c90eb18..ffc0666074d 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index e0b2c2494ad..96f122e59cd 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 92000240642..4beccac04b8 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 6240a2ed5c0..484cebf6a2a 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index e2c4be38a5f..a56201f7dba 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 51e133a86dc..84f6077e5ba 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index aab9c69c1a7..46685416239 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index dc9732c0719..1d41d1ab59e 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index 663adaffe60..d6dd854a240 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 73dc6489461..0b7d6a61f56 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index 0b42446740b..c1ee00edd07 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index 7d728850185..d694d696801 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index d062249c3b8..925ca9eee81 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f33c92ea7fe..f67337de388 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 92f21a35f28..8c8454fbc28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index e62275df23d..6c673570cfc 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 29ad3853f90..9c05ed97a8d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Ocbo +-- Copyright (C) 2005 Marc Barilley / Oc�bo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b9ba378d81f..b127b194fa5 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 8771b0ddda8..5c8ea94ed09 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 8bb011f7280..94ba92d4856 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 1aba5d286d1..4017ae32682 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index e0c4fd61701..2c77ae3447c 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 1e721e86788..52c0a3e2a03 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index d4ea3ad5535..439b2a68098 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index 6f8d6a8cf97..f01b7d02e8e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index 854ec6e826e..bd1e805aed2 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index f1e90520593..bfc2162ceca 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 15d3bda5ba2..784e3d37507 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 66a61851cae..029bc528b6e 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 195d2464738..9c066c54436 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index 44a301a2db7..f4e38524d25 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index 237b5c23030..f03d92ce651 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 3bec7551161..2c9c2d929db 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index 45845593162..d9e9ecd43a7 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql index 612755ce349..f2bb73a1bda 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_product_fournisseur.key.sql,v 1.3 2011/07/29 19:59:33 eldy Exp $ +-- $Id: llx_product_fournisseur.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 672374961d5..01cabfec865 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index d8d9443595d..696cf49c337 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index f21fed4d1af..170bd56f390 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index a501b4db4b6..5a3d71b489a 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index 41a91a9aa5f..d29449c2503 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index e12dbc6fb12..86f114d395b 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index 1a83bee6508..ce320558709 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 93a28593f8e..76f76ff08ed 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index ec2bb01863b..133687c7466 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 552a985abd4..6ccd3aa39fb 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index 63b28ac8410..e24a8918c5b 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index e7ccde53858..26e451271cb 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index a1619df5cb5..40b07d29305 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index 309c60b660f..e21669e63d7 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index c92472f7af5..d094512d975 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index 3fb70995900..a75fb9aa76d 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ +-- $Id: llx_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index e7fc66a0ed6..a0d88737e3f 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 57b252ed2ea..9e28a37d6bb 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index b8453ea821c..376447586c9 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index 00268974476..e7528a03f28 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 16bf4dea7f0..4f994cf57aa 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index eff6387abee..1a7fdfd755f 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index f53599483a4..a618e3d8790 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index b9643f019c3..902f2b4fd5f 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index db4cdd2581c..1f5500e2eb1 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index 6bf45f749f5..c7d84e27326 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 7db41de673c..523eb3b37e0 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index 8dc4636c87e..bf057b4ad75 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index d500fc1b7cb..ade6a40a80d 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index a515ba541bf..bca670bbb98 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index b742b82dafc..7481589df00 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index fff909a0ec8..4adaa1a56ff 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index fb65e9b7e84..16631c76b76 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 332b1305d38..3df14473a7e 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index ca4206eb6fc..c3958313ea3 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 68e1d4f20e9..910d2ab2072 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 8714e7e4a07..5c7f2e9a59c 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index 7d3b0eecd98..cbaadb10091 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index 8bdd7193d1a..e88665b5a34 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 367d45e8525..86916c216a2 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 28b28aeb762..23065b261c8 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ +-- $Id: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index d78db14c30b..3f58eaf698b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 68e46fd120d..18924ff6ac5 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 6acb2db4585..8056a150fc3 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 838f502bfdb..1b5ea5516d4 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index f21099e9c5e..e61985c7dd1 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index f771be5ef5a..7bf81b7fbe9 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 0033bca36bc..1fb0d708dfa 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 8037c9cd7e5..6df43634ec4 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 99234b6660f..7b6cbd91645 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index dca8e80f856..810781ed6d9 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index f3a58aa1433..2e89f083575 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index 98c56c37567..fd656c736ef 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 100d9fe82b0..87f6416c6c5 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ -- ============================================================================ CREATE LANGUAGE plpgsql; 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/lib/admin.lib.php b/htdocs/lib/admin.lib.php index c2d47f668da..4092c55ff2d 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ /** * \file htdocs/lib/admin.lib.php * \brief Library of admin functions - * \version $Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis 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.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $ */ function security_prepare_head() { @@ -615,16 +615,41 @@ function Activate($value,$withdeps=1) // Activate module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } $objMod = new $modName($db); @@ -700,20 +725,46 @@ function UnActivate($value,$requiredby=1) $modName = $value; $ret=''; + $modulesdir=array(); // Desactivation du module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } if ($found) diff --git a/htdocs/lib/ajax.lib.php b/htdocs/lib/ajax.lib.php index 7db1908bc49..55def736688 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ */ diff --git a/htdocs/lib/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/main.inc.php b/htdocs/main.inc.php index 49b67f9349a..1bdeb9562e6 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 03ef2767e40..eedd6a8841c 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -21,8 +21,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -30,7 +29,7 @@ * \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.350 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ */ @@ -71,14 +70,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root[]=$value; + $conf->file->dol_document_root['alt']=$value; } } diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1da2adb751e..8bccf934120 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index a65f888ab11..efbd289cb3f 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ */ require("../main.inc.php"); @@ -1646,6 +1645,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); +llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 79601ea1031..8f373b577e8 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 8cf57ec0b64..724900dc500 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ + * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ */ require("../main.inc.php"); @@ -272,5 +271,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); +llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); ?> diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 1dfd99cc99e..ec5d660daef 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -25,7 +25,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.125 2011/07/31 23:22:57 eldy Exp $ + * \version $Id: soc.php,v 1.126 2011/08/01 00:38:49 eldy Exp $ */ require("../main.inc.php"); @@ -587,7 +587,8 @@ else if ($conf->fournisseur->enabled && (GETPOST("type")=='f' || GETPOST("type")=='')) { $object->fournisseur=1; } if (GETPOST("private")==1) { $object->particulier=1; } - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prenom=$_POST["prenom"]; $object->particulier=$_REQUEST["private"]; $object->prefix_comm=$_POST["prefix_comm"]; @@ -1093,7 +1094,8 @@ else if (! empty($_POST["nom"])) { // We overwrite with values if posted - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prefix_comm=$_POST["prefix_comm"]; $object->client=$_POST["client"]; $object->code_client=$_POST["code_client"]; @@ -1967,5 +1969,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.125 $'); +llxFooter('$Date: 2011/08/01 00:38:49 $ - $Revision: 1.126 $'); ?> \ No newline at end of file diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 78ca25e85a6..edb62d728d5 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $ + * \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 9af151bc40a..c15f65c5630 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.88 2011/07/28 13:22:19 eldy Exp $ + * \version $Id: style.css.php,v 1.89 2011/07/31 23:22:05 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/freelug/style.css.php b/htdocs/theme/freelug/style.css.php index 928700d2f7a..bca03dc2770 100644 --- a/htdocs/theme/freelug/style.css.php +++ b/htdocs/theme/freelug/style.css.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/freelug/style.css.php * \brief Fichier de style CSS du theme Freelug - * \version $Id: style.css.php,v 1.43 2011/07/28 13:31:58 eldy Exp $ + * \version $Id: style.css.php,v 1.44 2011/07/31 23:22:05 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php index 74a4705b691..6e14cbf8e12 100644 --- a/htdocs/theme/yellow/style.css.php +++ b/htdocs/theme/yellow/style.css.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/yellow/style.css.php * \brief Fichier de style CSS du theme Yellow - * \version $Id: style.css.php,v 1.45 2011/07/28 13:31:58 eldy Exp $ + * \version $Id: style.css.php,v 1.46 2011/07/31 23:22:04 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index e4e52c611b4..9edcafd59c0 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/group/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.39 2011/07/31 23:21:25 eldy Exp $ + * \version $Id: perms.php,v 1.40 2011/08/01 13:15:53 hregis Exp $ */ require("../../main.inc.php"); @@ -93,10 +93,34 @@ if ($_GET["id"]) // Charge les modules soumis a permissions $modules = array(); - foreach ($conf->file->dol_document_root as $dirroot) + $modulesdir = array(); + + foreach ($conf->file->dol_document_root as $type => $dirroot) + { + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } + + foreach ($modulesdir as $dir) { - $dir = $dirroot . "/includes/modules/"; - // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
      "; $handle=@opendir($dir); @@ -292,5 +316,5 @@ if ($_GET["id"]) $db->close(); -llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.39 $'); +llxFooter('$Date: 2011/08/01 13:15:53 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index adb7fa764b6..47710b31d9d 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.56 2011/07/31 23:19:42 eldy Exp $ + * \version $Id: perms.php,v 1.57 2011/08/01 13:15:54 hregis Exp $ */ require("../main.inc.php"); @@ -120,12 +120,34 @@ $db->begin(); // Search all modules with permission and reload permissions def. $modules = array(); +$modulesdir = array(); -$listdir=$conf->file->dol_document_root; -foreach($listdir as $dirroot) +foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir=$dirroot."/includes/modules/"; + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} +foreach($modulesdir as $dir) +{ $handle=opendir($dir); if (is_resource($handle)) { @@ -373,5 +395,5 @@ print '
      '; $db->close(); -llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.56 $'); +llxFooter('$Date: 2011/08/01 13:15:54 $ - $Revision: 1.57 $'); ?> diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index 143af8934c7..fb4b85a0aa9 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/viewimage.php * \brief Wrapper to show images into Dolibarr screens * \remarks Call to wrapper is '' - * \version $Id: viewimage.php,v 1.96 2011/07/28 13:56:17 eldy Exp $ + * \version $Id: viewimage.php,v 1.97 2011/07/31 23:19:04 eldy Exp $ */ // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). From 67c77b043a7f9c05cd33fd1e40f8419cf6da3abd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:32:42 +0000 Subject: [PATCH 003/118] Fix: Avoid errors into rpm packages --- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 ++++++++--------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/install/default.css | 5 +- htdocs/langs/es_ES/html/gpl.html | 3 +- htdocs/langs/nl_BE/html/gpl.txt | 4 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- .../smartphone/theme/default/default.css.php | 5 +- 15 files changed, 525 insertions(+), 542 deletions(-) diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index c79d46fbeb5..698cceb4966 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,11 +11,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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ -/* \version $Id$ */ +/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index f91946e11c0..2d89cfd2388 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.js @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ // Instanciation et initialisation de l'objet xmlhttprequest diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 257b95e4e3c..6f6c7ed2a1b 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -65,7 +64,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.30 $'); + $ver=explode(' ','$Revision: 1.31 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 127eb16e389..446606ef055 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -64,7 +63,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
      This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.27 $'); + $ver=explode(' ','$Revision: 1.28 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 9c90d1fcc94..46fa4c9ccc4 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,9 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* or see http://www.gnu.org/ +* along with this program. If not, see . */ /** @@ -22,7 +20,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id$ + * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -61,7 +59,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
      This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision$'); + $ver=explode(' ','$Revision: 1.14 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index ec7e1af07c6..7055bef4b69 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index b1e3f5a2638..067e831b0b4 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,504 +1,503 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; If not, see . + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index b1e3f5a2638..e5f0ff4c0e5 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + License along with this library; If not, see . Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 9978c8f437a..1d2084e7c7f 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: default.css,v 1.24 2011/08/03 01:32:42 eldy Exp $ */ body { diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html index 38e0f007a15..eb72b9f79b0 100644 --- a/htdocs/langs/es_ES/html/gpl.html +++ b/htdocs/langs/es_ES/html/gpl.html @@ -302,8 +302,7 @@ GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General 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. + en inglés o portugués. Si no la hay, ve .

      Autor@mail.con.br Dirección

      Si el programa es interactivo, presenta en su salida un breve aviso cuando diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt index 3efbe1ccee7..738a6bd7754 100644 --- a/htdocs/langs/nl_BE/html/gpl.txt +++ b/htdocs/langs/nl_BE/html/gpl.txt @@ -310,9 +310,7 @@ ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene 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. +hebben samen met dit Programma; indien dit niet . 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/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index 454073d9730..d6bf7267439 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index b5304ba4198..6e1e7b262f4 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index bda35165079..b0a7c2dece6 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id$ + * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ */ if (session_id() == "") session_start(); diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index f93935ffb16..e78dff8f646 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id$ + * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal From 53813b09df88fe120674e06f50c8a04f889e09e9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:43:26 +0000 Subject: [PATCH 004/118] Work on rpm package --- build/makepack-dolibarr.pl | 9 ++++----- build/rpm/dolibarr.spec | 20 +++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index f1527da165b..af7d522b167 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.130 2011/08/03 00:47:37 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.131 2011/08/03 01:43:26 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.131 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -452,7 +452,6 @@ if ($nboftargetok) { $ret=`$cmd`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; @@ -491,7 +490,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; @@ -688,7 +687,7 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 08fe933d774..e6996caa4b3 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -226,8 +226,8 @@ if [ ! -f $config ] then echo Create empty file $config touch $config - chown -R root:$apachegroup $config - chmod -R 660 $config + %{__chown} -R root:$apachegroup $config + %{__chmod} -R 660 $config fi # Create config file for apache $apacheconfig @@ -241,10 +241,12 @@ 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 + semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" + semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" + semanage fcontext -a -t httpd_sys_script_rw_t "/var/www/dolibarr/install.lock" restorecon -R -v /etc/dolibarr - restorecon -R -v /var/www/dolibarr restorecon -R -v /usr/share/dolibarr + restorecon -v /var/www/dolibarr/install.lock fi # Create a config link dolibarr.conf @@ -255,13 +257,13 @@ fi # Set permissions echo Set permission to $apacheuser:$apachegroup on $targetdir -chown -R $apacheuser:$apachegroup $targetdir -chmod -R a-w $targetdir -chmod u+w $targetdir +%{__chown} -R $apacheuser:$apachegroup $targetdir +%{__chmod} -R a-w $targetdir +%{__chmod} u+w $targetdir echo Set permission to $apacheuser:$apachegroup on $docdir -chown -R $apacheuser:$apachegroup $docdir -chmod -R o-w $docdir +%{__chown} -R $apacheuser:$apachegroup $docdir +%{__chmod} -R o-w $docdir # Restart web server echo Restart web server From 08511d772055ceed25baa713c1443e297ae0af95 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:50:06 +0000 Subject: [PATCH 005/118] Work on rpm package --- htdocs/install/mysql/tables/llx_c_availability.sql | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index e2f225fe608..d1e6b216b4b 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ -- ======================================================================== create table llx_c_availability From e1fe145859ab56c8d77be595772d1f516a6e35a9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:51:30 +0000 Subject: [PATCH 006/118] Fix: Avoid errors into rpm packages --- htdocs/langs/es_ES/html/gpl.html | 329 ------------------------------ htdocs/langs/nl_BE/html/gpl.txt | 338 ------------------------------ htdocs/langs/nl_NL/html/gpl.txt | 339 ------------------------------- 3 files changed, 1006 deletions(-) delete mode 100644 htdocs/langs/es_ES/html/gpl.html delete mode 100644 htdocs/langs/nl_BE/html/gpl.txt delete mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html deleted file mode 100644 index eb72b9f79b0..00000000000 --- a/htdocs/langs/es_ES/html/gpl.html +++ /dev/null @@ -1,329 +0,0 @@ - - - - - - - - -H. Licencia Pública GNU - - - - - - - - - - - - - -

      Licencia Pública GNU

      - - - - -
      - -GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 - -
      - -

      Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, - MA 02139, USA.

      -

      Está permitido, a cualquier persona, copiar y distribuir copias tal cual de - este documento de licencia, sin la introducción de cualquier cambio. -

      - -
      -

      Introducción

      -

      Las licencias de muchos softwares se desarrollan para asegurar la libertad - de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, - al contrario, pretende garantizar la libertad de compartir y alterar softwares - de libre distribución - volviéndolos de libre distribución también para cualquier - de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares - de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla - (algunos softwares de la FSF son cubiertos por la GNU Library General Public - License).

      -

      Cuando nos referimos a softwares de libre distribución, nos referimos a la - libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar - la libertad de distribución de copias de softwares de libre distribución (y - cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos - fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se - hacen algunas restricciones, para asegurar los derechos de los programadores, - prohibiendo a todas las personas su negación o la solicitación de su abdicación. - Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución - o modificación del software.

      -

      Por ejemplo, al distribuirse copias de determinado programa, por una tasa - determinada o gratuitamente, se debe informar sobre todos los derechos incidentes - sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia - Pública General GNU.

      -

      La protección de los derechos envuelve dos pasos: (1) copyright del software - y (2) licencia que da permiso legal para copia, distribución y/o modificación - del softwares.

      -

      Aún para la protección de la FSF y del autor es importante que todos entiendan - que no hay garantías para softwares de libre distribución. Si software se modifica - por alguien y lo pasa adelante, este software no más reflejará el trabajo original - del autor no pudiendo, por consiguiente, ser garantizado por aquél.

      -

      Finalmente, cualquier programa de libre distribución está constantemente amenazado - por las patentes de softwares. Buscamos evitar el peligro de que distribuidores - de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. - Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación - de patente se debe hacer permitiendo el uso por cualquier individuo, sin la - necesidad de licencia de uso.

      -

      Los términos y condiciones precisas para copia, distribución y modificación - siguen abajo:

      -
      -

      Licencia Pública General GNU

      -

      TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN -

      - -
        - -

      1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga - un aviso colocado por el detentor de los derechos de autor diciendo que aquel - podrá ser distribuido en las condiciones de la Licencia Pública General. El - Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado - en un Programa y significa tanto el propio Programa, como cualquier de los - trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, - un trabajo que contenga el Programa o una parte de este, en su forma original - o con modificaciones o traducido para una otra lengua (la traducción está - incluida sin limitaciones en el término ``modificación'').

        -

        Actividades distintas de copia, distribución y modificación no están cubiertas - por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa - no está restringido y la salida del Programa está cubierta solamente en - el caso de que su contenido contenga trabajos basados en el Programa (independientemente - de que hayan sido creados por la ejecución del Programa). Si esto es así, - depende de las funciones ejecutadas por el Programa.

        2. - -

      2. El código fuente del Programa, de la forma como fue recibido, puede ser - copiado y distribuido, en cualquier media, desde que sea providenciado un - aviso adecuado sobre los copyrights y la negación de garantías, y todos los - avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, - estén inalterados y que cualquier producto oriundo del Programa esté acompañado - de esta Licencia Pública General.

        -

        Está permitido el cobro de tasas por el acto físico de transferencia o - grabación de copias, y pueden ser dadas garantías y soporte en cambio del - cobro de valores.

        3. - - -
      3. -

        Se puede modificar la copia o copias del Programa de cualquier forma que - se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir - tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

        - -
          -

        1. Debe existir un aviso destacado de que los datos originales fueron alterados - en los archivos y las fechas de los cambios;

          2. - -

        2. Debe existir un aviso de que el trabajo distribuido o publicado es, - de forma total o parcial, derivado del Programa o de alguna parte suya, - y que puede ser licenciado totalmente sin costes para terceros bajo los - términos de esta Licencia.

          3. - -

        3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, - en el inicio de tu ejecución, presentar la información de copyright y - de ausencia de garantías (o de que la garantía es de responsabilidad de - terceros), y que los usuarios pueden redistribuir el programa bajo estas - condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

          4. -
        - - Estos requisitos se aplican a trabajos de modificación en general. Si - algunas secciones identificables no sean derivadas del Programa, y pueden - ser consideradas como partes independientes, entonces esta Licencia y sus - Términos no se aplican a aquellas secciones cuando distribuidas separadamente. - Pero al distribuir aquellas secciones como parte de un trabajo basado en - el Programa, la distribución, como un todo, debe contener los términos de - esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no - a cada una de las partes independientemente de quem los tenga desarrollado. - Más que tener intención de contestar los derechos sobre el trabajo desarrollado - por alguien, esta sección objetiva propiciar la correcta distribución de - trabajos derivados del Programa. - Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado - en él ni a un trabajo basado en él, a un volumen de almacenaje o media de - distribución no obliga la utilización de esta Licencia y de sus términos - al trabajo. -
        4. - - -
      4. -

        Están permitidas, la copia y la distribución, del Programa (o un trabajo - basado en éste) en la forma de código objeto o ejecutable de acuerdo con los - términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

        - -
          -

        1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos - en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada - para manejo de softwares o

          -
          2. -

        2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, - de poner a disposición a terceros, por un coste no superior al coste del - medio físico de almacenaje, una copia completa de los códigos fuente en - medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

          -
          3. -

        3. Esté acompañada con la misma información recibida en relación con la - oferta de la distribución del código fuente correspondiente (esta alternativa - solamente está permitida para distribuciones no comerciales y solamente - si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, - de acuerdo con la sección 2 arriba).

          -
          4. -
        - El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones - en aquel trabajo. Cuando se habla en códigos fuentes completos significa - hablar de todos los fuentes de todos los módulos, además de las definiciones - de interfaces asociadas, archivos, scripts utilizados en la compilación - y instalación del ejecutable. Como una excepción excepcional, el código - fuente distribuido podrá no incluir algunos componentes que no se encuentren - en su escopo, como compilador, kernel, etc... para el SO donde el trabajo - sea ejecutado. - Si la distribución del ejecutable o objeto se hace, a través de acceso - a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente - de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos - con los objetos simultáneamente -
        5. - -
      5. -

        No está permitida la copia, modificación, sublicenciamiento o distribución - del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier - tentativa de copia, modificación, sublicenciamiento o distribución del Programa - está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. - Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, - no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas - de esta Licencia.

        6. -
      6. -

        No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá - documento o contrato que garantice permiso de modificación o distribución - del Programa o sus trabajos derivados. Estas acciones están prohibidas por - ley, en el caso de que no se acepten las condiciones de esta Licencia. La - modificación o distribución del Programa, o cualquier trabajo basado en éste, - implica en la aceptación de esta Licencia y de todos los términos de ésta - para copia, distribución o modificación del Programa o trabajos basados en - éste.

        7. -
      7. -

        Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), - el recipiente automáticamente recibe una licencia del detentor original de - los derechos de copia, distribución o modificación del Programa objeto de - estos términos y condiciones. No pueden ser impuestas otras restricciones - en los recipientes.

        8. - -
      8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes - o derechos de autor, se impongan restricciones, que contradigan esta Licencia, - estos no exentan de su aplicación. Si no es posible distribuir el Programa - de forma a garantizar simultáneamente las obligaciones de esta Licencia y - otras que sean necesarias, entonces el Programa no podrá ser distribuido. -

        Si esta Sección se considera, inválida por cualquier motivo particular - o general, su resultado implicará en la invalidación general de esta licencia - en la copia, modificación, sublicenciamiento o distribución del Programa - o trabajos basados en éste.

        -

        El propósito de esta sección no es, de forma alguna, incitar a quien quiera - que sea a infringir derechos reclamados en cuestiones válidas y procedentes, - y si proteger las premisas del sistema de libre distribución de software. - Muchas personas tienen hecho contribuciones generosas al sistema, en la - forma de programas, y es necesario garantizar la consistencia y credibilidad - del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución - de los softwares.

        -

        Esta sección pretende hacer claro los motivos que crearan las demás cláusulas - de estas Licencia.

        9. - -
      9. -

        Si la distribución del Programa, dentro de los términos de esta Licencia, - tiene restricciones en algún País, por patentes o derechos de autor, el detentor - original de los derechos de autor del Programa bajo esta Licencia puede adicionar - explícitamente limitaciones geográficas de distribución, excluyendo aquellos - Países, haciendo con que la distribución solamente sea posible en los Países - no excluidos.

        10. - -
      10. -

        La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) - puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública - General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos - objetivos y el espirito de la presente versión, pudiendo variar en detalles - referentes a nuevas situaciones encontradas.

        -

        A cada versión se da un número distinto. Si el Programa especifica, un - número de versión determinado de esta Licencia, que tenga en su contenido - la expresión ``o versión más actualizada'', es posible optar por las condiciones - de aquella versión o de cualquier versión más actualizada publicada por - la FSF.

        11. - -
      11. -

        Si deseas incorporar parte del Programa en otros programas de libre distribución - de softwares hace falta autorización formal del autor. Para softwares que - la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde - que mantenido el espirito y objetivos originales de esta Licencia.

        12. -
      - -

      AUSENCIA DE GARANTÍAS

      -
        -

      1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER - GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE - EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS - DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, - LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD - Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS - CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y - REPAROS JUZGADOS NECESARIOS.

        2. -

      2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR - LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN - RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE - HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS - O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES - O DAÑOS.

        -

        FIN DE LA LICENCIA

      - - -
      -

       

      -

      Apéndice

      -

      ¿Cómo aplicar estos términos a nuevos softwares?

      -

      Si has desarrollado un nuevo programa y deseas su amplia distribución para - el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, - que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

      -

      Para esto basta con anexar este aviso al programa. Se recomienda indicar aún - en el inicio de cada archivo fuente la ausencia de garantías y una anotación - de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

      -

      <nombre del programa y función> Copyright (C) 199X <Autor> -

      -

      Este programa es un software de libre distribución, que puede ser copiado - y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo - con la publicada por la Free Software Foundation, versión 2 de la licencia o - (a criterio del autor) cualquier versión posterior.

      -

      Este programa se distribuye en la expectativa de ser útil a sus usuarios, - pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE - ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General - 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, ve . -

      -

      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:

      -

      Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares - NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software - de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. - Teclea 'muestra condic' para mayores detalles.

      -

      Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las - partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos - pueden variar o pueden ser accionados por otras interfaces como clic de ratón, - etc...

      -

       

      -
      -
      - -www.conectiva.com - -
      - - - - - diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt deleted file mode 100644 index 738a6bd7754..00000000000 --- a/htdocs/langs/nl_BE/html/gpl.txt +++ /dev/null @@ -1,338 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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 . - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -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 deleted file mode 100644 index 778e2b02b41..00000000000 --- a/htdocs/langs/nl_NL/html/gpl.txt +++ /dev/null @@ -1,339 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van -deze licentie. \ No newline at end of file From 6fb96c2629c2405870890147f2c67666897d0a0e Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 29 Jul 2011 14:15:29 +0000 Subject: [PATCH 007/118] Fix: Missing translation Exit make a logout --- htdocs/cashdesk/tpl/menu.tpl.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) 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.'
        '; From e48e61c0f6947636b56d3e88bc2ce25b4bd64346 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 19:59:10 +0000 Subject: [PATCH 008/118] Fix: Missing key --- htdocs/install/mysql/tables/llx_product_fournisseur.key.sql | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql index f2bb73a1bda..612755ce349 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql @@ -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: llx_product_fournisseur.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id: llx_product_fournisseur.key.sql,v 1.3 2011/07/29 19:59:33 eldy Exp $ -- ============================================================================ From 1666fb400f2da9d2ca1888ff09c27a104530c1f2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 20:47:34 +0000 Subject: [PATCH 009/118] Fix: Uniformize error management --- htdocs/compta/bank/bankid_fr.php | 7 ++++--- htdocs/compta/bank/fiche.php | 7 ++++--- htdocs/product/class/product.class.php | 5 +++-- htdocs/product/fiche.php | 7 ++++--- htdocs/societe/class/companybankaccount.class.php | 5 +++-- htdocs/societe/rib.php | 7 ++++--- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 0c262ba2936..5ba2ef8997e 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -385,5 +386,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 525160df9ef..9ee1f551048 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ + * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -607,5 +608,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 8bccf934120..1da2adb751e 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ + * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index efbd289cb3f..a65f888ab11 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ + * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ */ require("../main.inc.php"); @@ -1645,6 +1646,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 8f373b577e8..79601ea1031 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 724900dc500..8cf57ec0b64 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ + * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ */ require("../main.inc.php"); @@ -271,5 +272,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); +llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); ?> From c83edbe3d6eea0760f79d6b08f4fab773dc712a6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 20:55:19 +0000 Subject: [PATCH 010/118] Fix: Trans From 677eef53ed6bb9c345edeb84a9a02c202d2a248f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 21:04:27 +0000 Subject: [PATCH 011/118] Fix: jnotify was not visible --- htdocs/admin/proxy.php | 7 ++++--- htdocs/admin/security_other.php | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 2c284c5cae8..f02e3d6203a 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ + * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -205,5 +206,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c1d629f7b7b..c0aaaa86213 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -347,5 +348,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); ?> From 7a561b7a4e6f7c2841cc66549ece173d145de399 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 21:15:39 +0000 Subject: [PATCH 012/118] Fix: If list is empty, show "None". --- htdocs/compta/prelevement/create.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 79d00ae00c7..689e2639773 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ + * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -275,5 +276,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); +llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); ?> From 1a1787c66253e0882c1013e087b3ce73e4695a32 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 21:24:04 +0000 Subject: [PATCH 013/118] Fix: Trans From 66b5072254b9b4c461a2c2c2264f7d38636ce62f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 22:31:37 +0000 Subject: [PATCH 014/118] Fix: Bad line --- htdocs/imports/import.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 $'); /* From 8d9df95aafec1ea2a2a618c332ba6faded39b358 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 30 Jul 2011 08:56:26 +0000 Subject: [PATCH 015/118] Fix: Removed not used function. --- htdocs/core/class/cookie.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 */ From 3c169db9d7ae8d1678e14d2983b9fba505e40956 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 30 Jul 2011 10:23:24 +0000 Subject: [PATCH 016/118] Fix: Code could not works for debian packages --- build/makepack-dolibarr.pl | 255 +++++++++---------------------- htdocs/admin/system/constall.php | 5 +- htdocs/core/class/conf.class.php | 9 +- htdocs/filefunc.inc.php | 7 +- htdocs/index.php | 7 +- htdocs/install/check.php | 9 +- htdocs/install/etape0.php | 9 +- htdocs/install/etape1.php | 10 +- htdocs/install/etape2.php | 9 +- htdocs/install/etape4.php | 9 +- htdocs/install/etape5.php | 19 ++- htdocs/install/fileconf.php | 46 +++--- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 9 +- htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 9 +- 16 files changed, 156 insertions(+), 274 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index af7d522b167..5dcf81d3a85 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.131 2011/08/03 01:43:26 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.122 2011/07/30 10:23:26 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -11,7 +11,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="1"; -$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="auto"; # auto use value found into BUILD @LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.131 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.122 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -254,11 +254,9 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliW*-*`; $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliM*-*`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.changes`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`; @@ -276,10 +274,6 @@ 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`; @@ -306,23 +300,18 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; + #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; + #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; } # Build package for each target @@ -421,19 +410,14 @@ if ($nboftargetok) { } if ($target eq 'RPM') { # Linux only - #$ARCH='i386'; - $ARCH='noarch'; + $ARCH='i386'; if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; } $newbuild = $BUILD; - # For fedora - $newbuild =~ s/(dev|alpha)/0.1.a/gi; # dev - $newbuild =~ s/beta/0.2.beta1/gi; # beta - $newbuild =~ s/rc./0.3.rc1/gi; # rc + $newbuild =~ s/(dev|alpha)/0/gi; # dev + $newbuild =~ s/beta/1/gi; # beta + $newbuild =~ s/rc./2/gi; # rc if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale - #$newbuild =~ s/(dev|alpha)/0/gi; # dev - #$newbuild =~ s/beta/1/gi; # beta - #$newbuild =~ s/rc./2/gi; # rc - #if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale + # now newbuild is 0-0 or 0-3 for example $REL1 = $newbuild; $REL1 =~ s/-.*$//gi; if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; } print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; @@ -445,102 +429,22 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$FILENAMETGZ2"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; - print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n"; - $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\""; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; $ret=`$cmd`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; - # To remove once stable - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - - # Apache conf files - print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; - $ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`; - - # Dolibarr conf files - # TODO - - # dolibarr.desktop - #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; - #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; - #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; - - # pixmap - #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; - #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; - #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; - - # Set owners - print "Set owners on files/dir\n"; - $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; - - print "Set permissions on files/dir\n"; - $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; - $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - - # Build tgz print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n"; $ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; @@ -568,17 +472,11 @@ if ($nboftargetok) { print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n"; $cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\""; $ret=`$cmd`; - print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n"; - $cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\""; - $ret=`$cmd`; - next; } - + if ($target eq 'DEB') { - $olddir=getcwd(); - $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -613,7 +511,7 @@ if ($nboftargetok) { $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; - open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error"; + open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -624,33 +522,20 @@ 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`; @@ -667,7 +552,6 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`; @@ -682,22 +566,19 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache and lighttpd conf files + # Apache conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; + + # Dolibarr conf files + # TODO # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -714,7 +595,17 @@ if ($nboftargetok) { print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`; - # Set owners + #print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n"; + #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`; + + # copyright (to build binary package directly without sources. Useless if we build from sources) + #print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n"; + #$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`; + + # changelog (to build binary package directly without sources. Useless if we build from sources) + #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`; + #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`; + print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`; @@ -743,45 +634,47 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - # Creation of binary package (to build without sources) - #print "Go to directory $BUILDROOT\n"; - #chdir("$BUILDROOT"); + print "Go to directory $BUILDROOT\n"; + $olddir=getcwd(); + chdir("$BUILDROOT"); + + # Creation of binary package (to build without sources) #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Prepare source package + # Creation of source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; $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/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; - $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; - $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; - $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; - $ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`; - $ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`; - $ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/debian/po"`; - $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`; + $ret=`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"`; # Add files also required to build binary package with dpkg-buildpackages - $ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`; $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; - - # Creation of source package - print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; @@ -794,18 +687,12 @@ if ($nboftargetok) { if ($OS =~ /windows/i) { print "Move *_all.deb to $DESTI\n"; - $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; - $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; - $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; - $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; + $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; } else { print "Move *_all.deb to $DESTI\n"; - $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; - $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; - $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; - $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; + $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; } next; } diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index f478b65e3a8..a07b28bd2cf 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/system/constall.php * \brief Page to show all Dolibarr setup (config file and database constants) - * \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $ + * \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $ */ require("../../main.inc.php"); diff --git a/htdocs/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/filefunc.inc.php b/htdocs/filefunc.inc.php index 3148174f5af..13a97bf54b3 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,14 +20,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -64,7 +65,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/index.php b/htdocs/index.php index f027e94a35a..5998094d362 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -573,7 +574,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); +llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9b19d9793fc..374ebd4ebbf 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: check.php,v 1.85 2011/07/30 10:23:25 eldy Exp $ */ include_once("./inc.php"); @@ -38,9 +39,7 @@ $langs->load("install"); // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin=''; -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } +if (file_exists("./install.forced.php")) include_once("./install.forced.php"); dolibarr_install_syslog("Dolibarr install/upgrade process started"); diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 737e16cc10c..f11fdb322b7 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ + * \version $Id: etape0.php,v 1.40 2011/07/30 10:23:25 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php @@ -48,9 +49,7 @@ $passroot=isset($_POST["db_pass_root"])?$_POST["db_pass_root"]:""; $main_dir=isset($_POST["main_dir"])?trim($_POST["main_dir"]):''; // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } +if (file_exists("./install.forced.php")) include_once("./install.forced.php"); dolibarr_install_syslog("--- etape0: Entering etape0.php page"); diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index c9713870c22..d430b8731df 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: etape1.php,v 1.134 2011/07/30 10:23:25 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php @@ -38,9 +39,7 @@ $langs->load("admin"); $langs->load("install"); // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } +if (file_exists("./install.forced.php")) include_once("./install.forced.php"); dolibarr_install_syslog("--- etape1: Entering etape1.php page"); @@ -527,7 +526,6 @@ function write_conf_file($conffile) global $dolibarr_main_url_root,$dolibarr_main_document_root,$dolibarr_main_data_root,$dolibarr_main_db_host; global $dolibarr_main_db_port,$dolibarr_main_db_name,$dolibarr_main_db_user,$dolibarr_main_db_pass; global $dolibarr_main_db_type,$dolibarr_main_db_character_set,$dolibarr_main_db_collation,$dolibarr_main_authentication; - global $conffile,$conffiletoshow,$conffiletoshowshort; $error=0; diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index e7b45a476f1..e29a0b49221 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape2.php,v 1.104 2011/07/30 10:23:25 eldy Exp $ */ include("./inc.php"); @@ -53,9 +54,7 @@ if ($dolibarr_main_db_type == "pgsql") $choix=2; if ($dolibarr_main_db_type == "mssql") $choix=3; // Init "forced values" to nothing. "forced values" are used after a Doliwamp install wizard. -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } +if (file_exists("./install.forced.php")) include_once("./install.forced.php"); dolibarr_install_syslog("--- etape2: Entering etape2.php page"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 62e0a4a90cf..80a2cf5f51d 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ + * \version $Id: etape4.php,v 1.36 2011/07/30 10:23:25 eldy Exp $ */ @@ -40,9 +41,7 @@ $langs->load("install"); // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin=''; -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } +if (file_exists("./install.forced.php")) include_once("./install.forced.php"); dolibarr_install_syslog("--- etape4: Entering etape4.php page"); diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 50fa9904890..af4df81ae1a 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape5.php,v 1.103 2011/07/30 10:23:25 eldy Exp $ */ include_once("./inc.php"); @@ -62,9 +63,12 @@ if (! isset($force_install_databasepass)) $force_install_databasepass=''; if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin=''; if (! isset($force_install_databaserootpass)) $force_install_databaserootpass=''; if (! isset($force_install_lockinstall)) $force_install_lockinstall=''; -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } +$usedoliwamp=false; +if (file_exists("./install.forced.php")) +{ + $usedoliwamp=true; + include_once("./install.forced.php"); +} dolibarr_install_syslog("--- etape5: Entering etape5.php page", LOG_INFO); @@ -101,7 +105,6 @@ if ($action == "set") */ pHeader($langs->trans("SetupEnd"),"etape5"); -print '
        '; // Test if we can run a first install process if (! GETPOST("versionfrom") && ! GETPOST("versionto") && ! is_writable($conffile)) @@ -205,7 +208,7 @@ if ($action == "set" || preg_match('/upgrade/i',$action)) if (! $resql) dol_print_error($db,'Error in setup program'); $conf->global->MAIN_VERSION_LAST_INSTALL=$targetversion; - if ($useforcedwizard) + if ($usedoliwamp) { dolibarr_install_syslog('install/etape5.php set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG); $resql=$db->query("DELETE FROM llx_const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'"); @@ -314,6 +317,7 @@ if ($action == "set") if (! empty($force_install_lockinstall)) { // Install is finished, we create the lock file + $lockfile="../../install.lock"; $fp = @fopen($lockfile, "w"); if ($fp) { @@ -363,6 +367,7 @@ elseif (preg_match('/upgrade/i',$action)) if (! empty($force_install_lockinstall)) { // Upgrade is finished, we create the lock file + $lockfile="../../install.lock"; $fp = @fopen($lockfile, "w"); if ($fp) { diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 2e0fccb0051..6448a678189 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ + * \version $Id: fileconf.php,v 1.92 2011/07/30 10:23:25 eldy Exp $ */ include_once("./inc.php"); @@ -38,8 +39,8 @@ $langs->load("install"); $langs->load("errors"); // You can force preselected values of the config step of Dolibarr by adding a file -// install.forced.php into directory htdocs/install (This is the case with some wizard -// installer like DoliWamp, DoliMamp or DoliBuntu). +// install.forced.php into directory htdocs/install (This is the case with some installer +// lile DoliWamp, DoliMamp or DoliBuntu. // We first init "forced values" to nothing. if (! isset($force_install_noedit)) $force_install_noedit=''; if (! isset($force_install_type)) $force_install_type=''; @@ -52,9 +53,7 @@ if (! isset($force_install_databasepass)) $force_install_databasepass=''; if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin=''; if (! isset($force_install_databaserootpass)) $force_install_databaserootpass=''; // Now we load forced value from install.forced.php file. -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } +if (file_exists("./install.forced.php")) include_once("./install.forced.php"); dolibarr_install_syslog("Fileconf: Entering fileconf.php page"); @@ -160,10 +159,7 @@ if (! empty($force_install_message)) } ?> - '; - print ''; - ?> + name="main_data_dir"> trans("WithNoSlashAtTheEnd")."
        "; @@ -171,7 +167,7 @@ if (! empty($force_install_message)) print $langs->trans("Examples").":
        "; ?>
          -
        • /var/lib/dolibarr/documents
          • +
        • /var/dolibarr_documents
        • C:/My Documents/dolibarr/
        @@ -209,10 +205,7 @@ if (empty($dolibarr_main_url_root)) trans("URLRoot"); ?> - '; - print ''; - ?> + value=""> trans("Examples").":
        "; ?>
          @@ -311,9 +304,9 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t if ($force_install_noedit && $force_install_type) print ''; print ''; + print '  '; - ?> + ?> trans("DatabaseType"); ?> @@ -346,7 +339,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t trans("DatabaseName"); ?> - trans("DatabaseName"); ?> @@ -365,7 +358,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t trans("Login"); ?> - trans("AdminLogin"); ?> @@ -373,7 +366,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t trans("Password"); ?> - trans("AdminPassword"); ?> @@ -382,7 +375,8 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t trans("CreateUser"); ?> - > trans("CheckToCreateUser"); ?> @@ -399,7 +393,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t trans("Login"); ?> -
          trans("DatabaseRootLoginDescription"); ?> @@ -410,7 +404,8 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t trans("Password"); ?> -
          trans("KeepEmptyIfNoPassword"); ?> @@ -441,9 +436,6 @@ jQuery(document).ready(function() { jQuery("#db_create_user").click(function() { init_needroot(); }); - - jQuery("#db_pass").focus(); - }); function checkDatabaseName(databasename) { diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 223a2eb6d92..3050d37833c 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -74,12 +75,10 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -$lockfile = '../../install.lock'; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; -#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here -$lockfile = '../../install.lock'; + if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -179,7 +178,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists($lockfile)) +if (file_exists('../../install.lock')) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
          '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index 841136fff8b..97810705926 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ + * \version $Id: licence.php,v 1.19 2011/07/30 10:23:25 eldy Exp $ */ include_once("./inc.php"); @@ -32,9 +33,7 @@ $langs->setDefaultLang($setuplang); $langs->load("install"); // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } +if (file_exists("./install.forced.php")) include_once("./install.forced.php"); dolibarr_install_syslog("Licence: Entering licence.php page"); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1bdeb9562e6..49b67f9349a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index eedd6a8841c..03ef2767e40 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -21,7 +21,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -29,7 +30,7 @@ * \ingroup core * \brief File that defines environment for all Dolibarr process (pages or scripts) * This script reads the conf file, init $lang, $db and and empty $user - * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ + * \version $Id: master.inc.php,v 1.350 2011/07/30 10:23:24 eldy Exp $ */ @@ -70,14 +71,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root['alt']=$value; + $conf->file->dol_document_root[]=$value; } } From f0e5dbb04c7ab95a63f228cda0e99b067a4c025a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 30 Jul 2011 11:12:52 +0000 Subject: [PATCH 017/118] Fix: Removed not used function. From 62ec1460d15e363e3e93611539b54668a8c527b8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 22:21:57 +0000 Subject: [PATCH 018/118] Fix: Avoid errors into rpm packages --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/control.DEBIAN | 46 + build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 - build/deb/install | 1 - build/deb/po/fr.po | 22 +- build/deb/po/templates.pot | 20 +- build/deb/postinst | 100 +- build/deb/postrm | 119 +- build/deb/templates | 7 - build/makepack-dolibarr.pl | 197 +++- build/rpm/README | 13 +- build/rpm/dolibarr.desktop | 3 +- build/rpm/dolibarr.spec | 173 ++- build/rpm/file_contexts.dolibarr | 6 +- dev/skeletons/modMyModule.class.php | 4 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 33 +- htdocs/admin/perms.php | 32 +- htdocs/admin/proxy.php | 7 +- htdocs/admin/security_other.php | 7 +- htdocs/admin/system/constall.php | 5 +- htdocs/boxes.php | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/tpl/validation1.tpl.php | 21 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/compta/prelevement/create.php | 7 +- htdocs/core/class/html.form.class.php | 11 +- htdocs/core/class/interfaces.class.php | 5 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 +++++++++-------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/install/check.php | 6 +- htdocs/install/default.css | 5 +- htdocs/install/etape0.php | 6 +- htdocs/install/etape1.php | 7 +- htdocs/install/etape2.php | 6 +- htdocs/install/etape4.php | 6 +- htdocs/install/etape5.php | 16 +- htdocs/install/fileconf.php | 43 +- htdocs/install/licence.php | 6 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 5 +- .../mysql/data/llx_20_c_departements.sql | 5 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- .../install/mysql/data/llx_c_currencies.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/data/llx_c_tva.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_departements.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_regions.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- htdocs/install/mysql/tables/llx_commande.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../mysql/tables/llx_commande_fournisseur.sql | 5 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/install/upgrade2.php | 5 +- htdocs/langs/es_ES/html/gpl.html | 330 ++++++ htdocs/langs/nl_BE/html/gpl.txt | 340 ++++++ htdocs/langs/nl_NL/html/gpl.txt | 339 ++++++ htdocs/lib/admin.lib.php | 77 +- htdocs/lib/ajax.lib.php | 5 +- htdocs/lib/pdf.lib.php | 5 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/societe/soc.php | 10 +- htdocs/theme/auguria/style.css.php | 5 +- htdocs/theme/eldy/style.css.php | 5 +- htdocs/theme/freelug/style.css.php | 5 +- .../smartphone/theme/default/default.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 +- 346 files changed, 2956 insertions(+), 1711 deletions(-) create mode 100755 build/deb/control.DEBIAN create mode 100644 htdocs/langs/es_ES/html/gpl.html create mode 100644 htdocs/langs/nl_BE/html/gpl.txt create mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index d73d7a99219..edb46ffd5a3 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,13 +22,12 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build binary only package +# dpkg -b To build package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# dpkg-reconfigure -plow package Reconfigure package +# # dpkg -L packagename List content of installed package -# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index 3382966714b..b035f18ae1d 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 + -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN new file mode 100755 index 00000000000..7c66775bdf1 --- /dev/null +++ b/build/deb/control.DEBIAN @@ -0,0 +1,46 @@ +Package: dolibarr +Version: __VERSION__ +Architecture: all +Maintainer: Laurent Destailleur +Installed-Size: 61200 +Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Section: web +Priority: optional +Homepage: http://www.dolibarr.org +Description: Easy to use web based ERP & CRM software + Dolibarr ERP & CRM is an easy to use open source/free software for small + and medium companies, foundations or freelances. It includes different + features for Enterprise Resource Planning (ERP) and Customer Relationship + Management (CRM) but also for different other activities. + It's a web software you can install as a standalone program or on any web + hosting provider to use it from anywhere with any web browser. + Dolibarr was designed to provide only features you need and be easy to use. + . + Only features you need are visible, depending on which module were activated. + Most common used modules are: + . + Customers, Suppliers or Prospects directory, + Contacts directory, + Orders management, + Commercial proposals management, + Invoices management, + Products and services catalog, + Stock management, + Foundations members management, + Bank accounts management, + Point of Sale, + Payments management, + Commercial actions management, + Contracts management, + Standing orders management, + Shipping management, + Donations management, + Bookmarks management, + Mass Emailings, + Reports, + Wizards to export and import data, + LDAP connectivity, + PDF exports, + And a lot of more modules... + . + You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index e28258d8dbc..91f0705c001 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,16 +4,10 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper (>= 7), po-debconf +Build-Depends: debhelper, po-debconf Package: dolibarr -Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, - php5-mysql | php5-mysqli, - php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, - ${misc:Depends}, xdg-utils, - mysql-server, perl -Recommends: apache2 | lighttpd | httpd, mysql-client -Suggests: www-browser +Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl Architecture: all Section: web Priority: optional diff --git a/build/deb/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 b/build/deb/install index 2928d378abc..4d41fd52c65 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,5 +1,4 @@ etc/dolibarr/apache.conf -etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 3bbe762283a..13b8030ed0d 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:49+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,26 +25,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Seveur web à reconfigurer automatiquement:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"dolibarr." -msgstr "" -"Selectionnez le serveur web à configurer automatiquement pour utiliser " -"dolibarr." - # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -52,7 +36,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index d65e5d8b7f6..32c92a97cc4 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,29 +17,15 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"dolibarr." -msgstr "" - #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index e0bba1be4da..ca5fd1645dd 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,5 +1,7 @@ #!/bin/sh # postinst script for dolibarr +# +# see: dh_installdeb(1) set -e @@ -14,31 +16,6 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - - -lighttpd_install() { - if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - if which lighty-enable-mod >/dev/null 2>&1 ; then - echo "Add link for Lighttpd config file" - ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf - # We enabled it - lighty-enable-mod dolibarr fastcgi-php - else - echo "Lighttpd not installed, skipping" - fi - fi -} - -apache_install() { - webserver=$1 - if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Add link for Apache config file" - ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - . /usr/share/debconf/confmodule db_version 2.0 @@ -50,6 +27,8 @@ echo Run the dolibarr postinst script # Define vars docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" installconfig="/etc/dolibarr/install.forced.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php" @@ -65,6 +44,10 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir + # Copy apache.conf file into target directory + #mkdir -p /etc/dolibarr + #cp -p $apachefileorig $apacheconfig + # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -91,15 +74,21 @@ case "$1" in chmod -R 660 $config fi - - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - + # Get the web server type (use db_get for interactive mode). + #db_reset "dolibarr/webserver" + #db_get "dolibarr/webserver" # Read value for webserver. + #webserver="$RET" + + case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; + esac + # Set up web server. - for webserver in $webservers ; do - webserver=${webserver%,} - echo Complete config of server $webserver + for server in $webservers ; do + echo Complete config of server $server # Detect webuser and webgroup webuser= @@ -117,31 +106,26 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config + + # Add link to config file + echo Setup web server $server to add dolibarr config file + ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf + done - # Restart web server. - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_install - else - apache_install $webserver - fi - # Reload webserver in any case, configuration might have changed - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $webserver reload 3>/dev/null || true - else - echo Restart web server $server using $server reload - /etc/init.d/$webserver reload 3>/dev/null || true - fi - fi + # Restart servers + servers="apache2-ssl apache2 mysql" + # Another way to restart + for server in $servers ; do + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $server reload || true + else + echo Restart web server $server using $server reload + /etc/init.d/$server reload || true + fi done - echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -152,13 +136,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument $1" >&2 + echo "postinst called with unknown argument \`$1'" >&2 exit 0 ;; esac -#DEBHELPER# - db_stop +#DEBHELPER# + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 27ce3777b7e..9eae81b022b 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,36 +17,7 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - -lighttpd_remove() { - if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - echo "Remove link for Lighttpd config file" - rm -f /etc/lighttpd/conf-available/50-dolibarr.conf - if which lighty-enable-mod >/dev/null 2>&1 ; then - lighty-disable-mod dolibarr - else - echo "Lighttpd not installed, skipping" - fi - # See bug #448682 - if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then - echo 'Manually deleting lighttpd/dolibarr configuration link' - rm /etc/lighttpd/conf-enabled/50-dolibarr.conf - fi - fi -} - -apache_remove() { - if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Remove link for Apache config file" - rm -f /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule -fi +. /usr/share/debconf/confmodule db_version 2.0 @@ -55,62 +26,63 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" +export webserver="" +# Allows us to loop and substitute in one pass +case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; +esac + case "$1" in # Call when we upgrade upgrade) - echo "postrm upgrade" ;; # Call when we uninstall remove) - echo "postrm remove" rm -f $lockfile - # Reconfigure web server - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - - # Restart web servers - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_remove - else - apache_remove $webserver - fi - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $webserver reload 3>/dev/null || true - else - /etc/init.d/$webserver reload 3>/dev/null || true - fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete link $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge" + echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical dolibarr/postrm || true + db_input critical "dolibarr/postrm" || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get dolibarr/postrm + db_get "dolibarr/postrm" set -e if [ "$RET" = "true" ] ; then @@ -213,12 +185,41 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete file $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" + fi + done + rm -rf /etc/dolibarr + # Restart servers + for server in $restart ; do + # We disable blocking errors + set +e + echo "Restart server $server if exists" + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $server reload || true + else + /etc/init.d/$server reload || true + fi + # We restore blocking errors + set -e + done + # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset dolibarr/reconfigure-webserver - db_reset dolibarr/postrm + db_reset "dolibarr/postrm" set -e #db_purge @@ -228,7 +229,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument $1" >&2 + echo "postrm called with unknown argument \`$1'" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index b96325a4e64..5c06afd8ccd 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,10 +1,3 @@ -Template: dolibarr/reconfigure-webserver -Type: multiselect -Choices: apache2, lighttpd -_Description: Web server to reconfigure automatically: - Please choose the web server that should be automatically configured - to run dolibarr. - Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 5dcf81d3a85..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.122 2011/07/30 10:23:26 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.122 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -254,9 +254,11 @@ 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`; @@ -274,6 +276,10 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mssql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`; @@ -410,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"; @@ -435,16 +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/$PROJECT.tmp/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + # To remove once stable + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + + # Apache conf files + #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + + # Dolibarr conf files + # TODO + + # dolibarr.desktop + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; + #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; + #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; + + # pixmap + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; + #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; + #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; + + # Set owners + print "Set owners on files/dir\n"; + $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; + + print "Set permissions on files/dir\n"; + $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; + $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + + # Build tgz print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n"; $ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; @@ -472,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; } @@ -522,20 +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`; @@ -595,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`; @@ -649,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`; @@ -687,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; } 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 e6996caa4b3..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,39 +205,36 @@ 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 ] then echo Create empty file $config touch $config - %{__chown} -R root:$apachegroup $config - %{__chmod} -R 660 $config + chown -R root:$apachegroup $config + chmod -R 660 $config fi # Create config file for apache $apacheconfig -#if [ ! -f $apacheconfig ]; then -# echo Create dolibarr web server config file $apacheconfig -# cp $apachefileorig $apacheconfig -# chmod a-x $apacheconfig -# chmod go-w $apacheconfig -#fi +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 - semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" - semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" - semanage fcontext -a -t httpd_sys_script_rw_t "/var/www/dolibarr/install.lock" - restorecon -R -v /etc/dolibarr - restorecon -R -v /usr/share/dolibarr - restorecon -v /var/www/dolibarr/install.lock +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 @@ -257,13 +245,25 @@ fi # Set permissions echo Set permission to $apacheuser:$apachegroup on $targetdir -%{__chown} -R $apacheuser:$apachegroup $targetdir -%{__chmod} -R a-w $targetdir -%{__chmod} u+w $targetdir +chown -R $apacheuser:$apachegroup $targetdir +chmod -R a-w $targetdir +chmod u+w $targetdir echo Set permission to $apacheuser:$apachegroup on $docdir -%{__chown} -R $apacheuser:$apachegroup $docdir -%{__chmod} -R o-w $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 @@ -274,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 -----" @@ -307,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 @@ -344,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 @@ -362,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/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/proxy.php b/htdocs/admin/proxy.php index f02e3d6203a..2c284c5cae8 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ */ require("../main.inc.php"); @@ -206,5 +205,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); +llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c0aaaa86213..c1d629f7b7b 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ */ require("../main.inc.php"); @@ -348,5 +347,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); +llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); ?> diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index a07b28bd2cf..f478b65e3a8 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.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/constall.php * \brief Page to show all Dolibarr setup (config file and database constants) - * \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $ + * \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $ */ require("../../main.inc.php"); 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/css/style.css b/htdocs/cashdesk/css/style.css index 698cceb4966..c79d46fbeb5 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,10 +11,11 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ +/* \version $Id$ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index 2d89cfd2388..f91946e11c0 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.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. */ // Instanciation et initialisation de l'objet xmlhttprequest 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/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 96de90124f9..259dc4dbce5 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -47,7 +48,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -66,7 +67,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -77,17 +78,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 5ba2ef8997e..0c262ba2936 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ */ require("./pre.inc.php"); @@ -386,5 +385,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); +llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 9ee1f551048..525160df9ef 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ */ require("./pre.inc.php"); @@ -608,5 +607,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); +llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); ?> diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 0efb704828f..e05eaa66ecf 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ + * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ */ require('../main.inc.php'); @@ -1031,5 +1032,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); +llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 5da397b4183..d2f2a7aae7e 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ + * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ */ require('../main.inc.php'); @@ -672,5 +673,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); +llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); ?> diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 689e2639773..79d00ae00c7 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ + * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -276,5 +275,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); +llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); ?> diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index e24b3c7c717..cb4a0f7a5cf 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -23,14 +23,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.193 2011/07/31 23:45:14 eldy Exp $ + * \version $Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $ */ @@ -160,10 +161,8 @@ class Form $htmltext=str_replace("\n","",$htmltext); $htmltext=str_replace('"',""",$htmltext); - if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip - else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag - if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip - else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip + $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag $s=""; if (empty($notabs)) $s.=''; diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 2ca2f82789e..8deeda0fb57 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/interfaces.class.php * \ingroup core * \brief Fichier de la classe de gestion des triggers - * \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $ */ diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 6f6c7ed2a1b..257b95e4e3c 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -64,7 +65,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.31 $'); + $ver=explode(' ','$Revision: 1.30 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 446606ef055..127eb16e389 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -63,7 +64,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
          This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.28 $'); + $ver=explode(' ','$Revision: 1.27 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 46fa4c9ccc4..9c90d1fcc94 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,7 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program. If not, see . +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* or see http://www.gnu.org/ */ /** @@ -20,7 +22,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -59,7 +61,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
          This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.14 $'); + $ver=explode(' ','$Revision$'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index 7055bef4b69..ec7e1af07c6 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ + * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/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/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index 067e831b0b4..b1e3f5a2638 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,503 +1,504 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index e5f0ff4c0e5..b1e3f5a2638 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,7 +484,8 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 374ebd4ebbf..3724ef23d95 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.85 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); @@ -39,7 +39,9 @@ $langs->load("install"); // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin=''; -if (file_exists("./install.forced.php")) include_once("./install.forced.php"); +$useforcedwizard=false; +if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } +else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } dolibarr_install_syslog("Dolibarr install/upgrade process started"); diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 1d2084e7c7f..9978c8f437a 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/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.24 2011/08/03 01:32:42 eldy Exp $ + * $Id$ */ body { diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index f11fdb322b7..20ef1080e85 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -22,7 +22,7 @@ * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.40 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php @@ -49,7 +49,9 @@ $passroot=isset($_POST["db_pass_root"])?$_POST["db_pass_root"]:""; $main_dir=isset($_POST["main_dir"])?trim($_POST["main_dir"]):''; // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. -if (file_exists("./install.forced.php")) include_once("./install.forced.php"); +$useforcedwizard=false; +if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } +else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } dolibarr_install_syslog("--- etape0: Entering etape0.php page"); diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index d430b8731df..5d7fca530f2 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -24,7 +24,7 @@ * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.134 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php @@ -39,7 +39,9 @@ $langs->load("admin"); $langs->load("install"); // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. -if (file_exists("./install.forced.php")) include_once("./install.forced.php"); +$useforcedwizard=false; +if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } +else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } dolibarr_install_syslog("--- etape1: Entering etape1.php page"); @@ -526,6 +528,7 @@ function write_conf_file($conffile) global $dolibarr_main_url_root,$dolibarr_main_document_root,$dolibarr_main_data_root,$dolibarr_main_db_host; global $dolibarr_main_db_port,$dolibarr_main_db_name,$dolibarr_main_db_user,$dolibarr_main_db_pass; global $dolibarr_main_db_type,$dolibarr_main_db_character_set,$dolibarr_main_db_collation,$dolibarr_main_authentication; + global $conffile,$conffiletoshow,$conffiletoshowshort; $error=0; diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index e29a0b49221..d7df4ac6929 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -21,7 +21,7 @@ * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.104 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ */ include("./inc.php"); @@ -54,7 +54,9 @@ if ($dolibarr_main_db_type == "pgsql") $choix=2; if ($dolibarr_main_db_type == "mssql") $choix=3; // Init "forced values" to nothing. "forced values" are used after a Doliwamp install wizard. -if (file_exists("./install.forced.php")) include_once("./install.forced.php"); +$useforcedwizard=false; +if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } +else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } dolibarr_install_syslog("--- etape2: Entering etape2.php page"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 80a2cf5f51d..9a0dd0fcc43 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -23,7 +23,7 @@ * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.36 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ */ @@ -41,7 +41,9 @@ $langs->load("install"); // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin=''; -if (file_exists("./install.forced.php")) include_once("./install.forced.php"); +$useforcedwizard=false; +if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } +else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } dolibarr_install_syslog("--- etape4: Entering etape4.php page"); diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index af4df81ae1a..0037190af06 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -24,7 +24,7 @@ * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.103 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ */ include_once("./inc.php"); @@ -63,12 +63,9 @@ if (! isset($force_install_databasepass)) $force_install_databasepass=''; if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin=''; if (! isset($force_install_databaserootpass)) $force_install_databaserootpass=''; if (! isset($force_install_lockinstall)) $force_install_lockinstall=''; -$usedoliwamp=false; -if (file_exists("./install.forced.php")) -{ - $usedoliwamp=true; - include_once("./install.forced.php"); -} +$useforcedwizard=false; +if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } +else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } dolibarr_install_syslog("--- etape5: Entering etape5.php page", LOG_INFO); @@ -105,6 +102,7 @@ if ($action == "set") */ pHeader($langs->trans("SetupEnd"),"etape5"); +print '
          '; // Test if we can run a first install process if (! GETPOST("versionfrom") && ! GETPOST("versionto") && ! is_writable($conffile)) @@ -208,7 +206,7 @@ if ($action == "set" || preg_match('/upgrade/i',$action)) if (! $resql) dol_print_error($db,'Error in setup program'); $conf->global->MAIN_VERSION_LAST_INSTALL=$targetversion; - if ($usedoliwamp) + if ($useforcedwizard) { dolibarr_install_syslog('install/etape5.php set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG); $resql=$db->query("DELETE FROM llx_const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'"); @@ -317,7 +315,6 @@ if ($action == "set") if (! empty($force_install_lockinstall)) { // Install is finished, we create the lock file - $lockfile="../../install.lock"; $fp = @fopen($lockfile, "w"); if ($fp) { @@ -367,7 +364,6 @@ elseif (preg_match('/upgrade/i',$action)) if (! empty($force_install_lockinstall)) { // Upgrade is finished, we create the lock file - $lockfile="../../install.lock"; $fp = @fopen($lockfile, "w"); if ($fp) { diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 6448a678189..6d19b01e197 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -25,7 +25,7 @@ * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.92 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); @@ -39,8 +39,8 @@ $langs->load("install"); $langs->load("errors"); // You can force preselected values of the config step of Dolibarr by adding a file -// install.forced.php into directory htdocs/install (This is the case with some installer -// lile DoliWamp, DoliMamp or DoliBuntu. +// install.forced.php into directory htdocs/install (This is the case with some wizard +// installer like DoliWamp, DoliMamp or DoliBuntu). // We first init "forced values" to nothing. if (! isset($force_install_noedit)) $force_install_noedit=''; if (! isset($force_install_type)) $force_install_type=''; @@ -53,7 +53,9 @@ if (! isset($force_install_databasepass)) $force_install_databasepass=''; if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin=''; if (! isset($force_install_databaserootpass)) $force_install_databaserootpass=''; // Now we load forced value from install.forced.php file. -if (file_exists("./install.forced.php")) include_once("./install.forced.php"); +$useforcedwizard=false; +if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } +else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } dolibarr_install_syslog("Fileconf: Entering fileconf.php page"); @@ -159,7 +161,10 @@ if (! empty($force_install_message)) } ?>           @@ -205,7 +210,10 @@ if (empty($dolibarr_main_url_root)) '; + print ''; - ?> + ?> @@ -339,7 +347,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t - @@ -358,7 +366,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t - @@ -366,7 +374,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t - @@ -375,8 +383,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t - @@ -393,7 +400,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t - -
          - name="main_data_dir"> + '; + print ''; + ?> trans("WithNoSlashAtTheEnd")."
          "; @@ -167,7 +172,7 @@ if (! empty($force_install_message)) print $langs->trans("Examples").":
          "; ?>
            -
          • /var/dolibarr_documents
            • +
          • /var/lib/dolibarr/documents
          • C:/My Documents/dolibarr/
          		 trans("URLRoot"); ?> - value=""> + '; + print ''; + ?> trans("Examples").":
          "; ?>
            @@ -304,9 +312,9 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t if ($force_install_noedit && $force_install_type) print ''; print '  
          		 trans("DatabaseType"); ?>
          trans("DatabaseName"); ?> trans("DatabaseName"); ?>
          trans("Login"); ?> trans("AdminLogin"); ?>
          trans("Password"); ?> trans("AdminPassword"); ?>
          trans("CreateUser"); ?> > trans("CheckToCreateUser"); ?>
          trans("Login"); ?>
          trans("DatabaseRootLoginDescription"); ?> @@ -404,8 +411,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
          trans("Password"); ?>
          trans("KeepEmptyIfNoPassword"); ?> @@ -436,6 +442,9 @@ jQuery(document).ready(function() { jQuery("#db_create_user").click(function() { init_needroot(); }); + + jQuery("#db_pass").focus(); + }); function checkDatabaseName(databasename) { diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index 97810705926..c786f91346c 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -21,7 +21,7 @@ * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.19 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ */ include_once("./inc.php"); @@ -33,7 +33,9 @@ $langs->setDefaultLang($setuplang); $langs->load("install"); // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. -if (file_exists("./install.forced.php")) include_once("./install.forced.php"); +$useforcedwizard=false; +if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } +else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } dolibarr_install_syslog("Licence: Entering licence.php page"); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 275298588e2..9d08a56e41c 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,9 +17,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_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 8ea28cbbcc3..1f046a29bc4 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -18,9 +18,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_10_c_regions.sql,v 1.14 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 4be9b6b7719..9a109ab3fdc 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -18,9 +18,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_20_c_departements.sql,v 1.16 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index da244f79951..56ceea3d807 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,9 +17,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_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index eee5dfa185a..3a248c2f49f 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,9 +18,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_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index e3922b97f65..dcbaf2faaf4 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,9 +17,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_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index b7f6c71c87e..1dd3cb59a62 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,9 +11,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_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index f3299990858..5e93e39d048 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,9 +17,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_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index 1f14cc8c142..e3ed8196d17 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,9 +17,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_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 5017ce0c60d..176e5c796e2 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,9 +17,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_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql index eeb2c376b85..ad7c175fcc4 100644 --- a/htdocs/install/mysql/data/llx_c_currencies.sql +++ b/htdocs/install/mysql/data/llx_c_currencies.sql @@ -17,9 +17,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_c_currencies.sql,v 1.8 2011/08/03 01:25:46 eldy Exp $ +-- $Id: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index f58db2b32a6..db630463dbf 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,9 +17,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_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index 079caa7dde4..c67d263853d 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,9 +17,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_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 4bb81528e74..07fa2abaa83 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,9 +18,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_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index 720413ac480..e29b3f306f5 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,9 +17,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_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index cb0b557b438..c7fa6b6dd1f 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.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_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index a3a19cc2125..6a597996424 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,9 +17,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_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 1ec498e6bc2..78e174b9817 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,9 +17,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_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a17978bb0c..3a535a5098e 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,9 +17,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_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index 96d456312df..f6395abbfcd 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,9 +17,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_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 488b0a564eb..9c28f697f83 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,9 +17,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_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index d8701c52c01..988d9c26136 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,9 +17,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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- @@ -33,4 +34,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2fd47385a90..2d1a3c62a39 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,9 +17,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_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 788e9e82f39..056dbdbdb6e 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -18,9 +18,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_c_tva.sql,v 1.27 2011/08/03 01:25:44 eldy Exp $ +-- $Id: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index da98640fd25..4238000eb14 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,9 +17,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_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 789ad16fce2..6e596be24e5 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,9 +17,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_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index 48b77951e1f..e2faed3cba3 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,9 +17,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_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index 59bd3d1ef00..cf7e9e96275 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,9 +17,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_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index cd2f27a5dca..655848a50ae 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.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: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 42f86f1c447..968a131e2bb 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -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: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 685170362fd..6e6e960072b 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.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_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 921bc569980..02ff06ba9f1 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.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_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index d5902b539c7..f22262c9353 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.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_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index ddd3d734ff7..b2cdf08af5f 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.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_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 8c5c23bbe62..031bfb614e1 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -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: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index f7b876eed86..3aa9555979e 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -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: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 8d34e2a9c78..4703aa32ddd 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -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: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index ad6f448e3dc..69bf706ca68 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,9 +15,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_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 51d66c04584..9156b439833 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,9 +15,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_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index 7df7f21a3b9..db64e0cbf9c 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -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: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index 31676d7d6e2..a7efcbd0f6d 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -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: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index bc9d9ad0936..7e4fa074e71 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -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: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index 18eed730ab8..d23a1367f92 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index ade41da746e..2b2db5af657 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index 62a88236480..b5c9175202b 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 015a9e9b4c0..6ed1e00dd88 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index 296b49fc93f..d1279c21eb2 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 9cedf70e7ca..822a69bc4ec 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index 55718d8ffb5..aba765190ee 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.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_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index abc9baa2d8c..eded16c49fe 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -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: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index 3dd83585bcd..e39fbf71f12 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -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: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 217edcaddbb..3710a87470a 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -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: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index 5869f24d8bd..ad41449f288 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -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: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index 5db17f19069..f6301a24919 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index 5f66ff625f0..cd68a9cdb40 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index b0546729ef0..890c7597862 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.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_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index 4794113f8bd..d67cf7fe4b8 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -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: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5fc25f57339..5c06c73c69d 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 5746cce26aa..115bd310d70 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index ba1e56e2b94..d3c71cc4a70 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.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_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index de9c23e9c05..10c4cc2d853 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,10 +13,11 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, 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_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index cce9d04707b..09365976d78 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.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_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 93e8e3d99a7..463b1235094 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -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: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index b0f31fe7116..c81a2b3e830 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -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: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index cb2251cfaf6..821fe3e5c04 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -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: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 8bebcf13116..9380607010d 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index b30354cae19..e524d9c937a 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index b026a40d762..0b0b34390c4 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -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: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 39d21cee7b9..7b5fa661d7d 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -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: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index d1e6b216b4b..e2f225fe608 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.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_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 60af7723f30..66cd5111325 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -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: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index cb223ae5532..ebca12ab5da 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -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: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 415b8526793..3872bedd39d 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -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: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index 5c54695f608..bed4ad41dfc 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 93ef5d59770..23cd0f575ed 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index 7702a8cf21e..f46d2a56c33 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.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_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_departements.sql b/htdocs/install/mysql/tables/llx_c_departements.sql index ea1f7543428..ab0ea5dc0c3 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.sql @@ -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: llx_c_departements.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id: llx_c_departements.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ -- ======================================================================== create table llx_c_departements diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 46a35567e95..4669de108f4 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.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_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index c2c43a3a625..a6bb8ca70f7 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -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: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 547500d7f33..5637e5a987d 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -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: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index bf7ed18af80..884d8274cfd 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.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_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index d0dceaf0fe1..2b6dea6cbd3 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -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: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 192183be0c1..76aecebbb9a 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -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: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index d6d673962b9..665a210d74b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -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: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index c8deefef6d7..7fcd57e31eb 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -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: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index 757653f1fc2..e1cab3b3368 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -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: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f2fb7fda4d3..f97e458be6b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -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: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 7a228ec1572..165a8550331 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -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: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 120e27ae77d..6efa388ef81 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.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_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index a5e3fd8721b..c8824b2d04e 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.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_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 418e37a85b1..311183c87f4 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.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_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 1cc5dbfaf0e..2d00f620e02 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -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: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 84c72e0839b..02052920c8a 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -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: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 8cf0ec900f8..0f608cbc171 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.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_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 2eed307bc54..75b40946559 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.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_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql index 5ef6fb221e6..d9d0f2d1b0c 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.sql @@ -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: llx_c_regions.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id: llx_c_regions.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ -- ======================================================================== create table llx_c_regions diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index c977dd9dd21..76caf44356d 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 8307ca88eb6..861671e3607 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -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: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 9a7bda88c28..46504e8a1c4 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -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: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index 725ddbfeb90..dc284fc8cea 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -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: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index a1feeb33f8b..4f8736a3a14 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -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. -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -23,7 +24,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 1e141b7768a..85ea592d950 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -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: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 79d54faf623..9fad6cc333e 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -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: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index 97638937c74..d6bd27758b4 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -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: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 211af70a854..40759cdc50b 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.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_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 7c4c534451d..80e73c43399 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -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: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index f2330322a5f..4c466e0c02b 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -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: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 8e4492c28a9..46a39b3c9e7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -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: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 39be52cf374..60641bf1876 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -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: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index e93ce9b4354..cfe126b5adf 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.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_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index baa01289b96..7e12e06beb7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -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: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index bd19d25f1a5..83eb804c875 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -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: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index eb95b9fe66c..6236e113766 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -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: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index 2c95fde3255..cf5121c34f9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -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: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index d62011351c4..cabdcce3a80 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index a07ff049d61..ebaf9582414 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index 730bc11ac98..fa9a85aac1f 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -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: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index 6f129f2feec..ec8931763bf 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -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: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 731cf8fb0f4..9c6e2a065f8 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -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: llx_commande.sql,v 1.14 2011/08/03 01:25:34 eldy Exp $ +-- $Id: llx_commande.sql,v 1.13 2011/07/28 22:22:31 eldy Exp $ -- =================================================================== create table llx_commande diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 172a2432ee1..7958b56f354 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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. -- --- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orphelins pour permettre mont�e de la cl� +-- Supprimme orphelins pour permettre monte de la cl -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index f1c8c7ac579..3ef51d6ae21 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -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: llx_commande_fournisseur.sql,v 1.8 2011/08/03 01:25:32 eldy Exp $ +-- $Id: llx_commande_fournisseur.sql,v 1.7 2011/07/28 22:22:31 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index c13c0aa6019..3f848c9ffe2 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index f0c65456e5c..df6d49827f6 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index be4e60a9a97..9bb45f9d326 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -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: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 23cfd068495..91914ab66c7 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -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: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b18165255..d1b39863cab 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -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: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index 19ec675f973..e964fbc2f5e 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -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: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a53a24d9a66..a747c714fb3 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.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_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 46639ca7c1e..16ecb365d6c 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.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_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index d1ba0645e05..bfce896eb19 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.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_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index b7fc52403af..51234007ee1 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.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_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index 4187f526393..eead2907fa2 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,9 +15,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_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 7b74d8b506d..1c757fa6c86 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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. -- --- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orhpelins pour permettre mont�e de la cl� +-- Supprimme orhpelins pour permettre monte de la cl -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index f1f4a75b604..79b52ba399c 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -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: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 39b89773316..3757e4522bf 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -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: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index 98b29b1f715..f5987250001 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -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: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 0eb566317d0..9c4a5e340ab 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 3fb9f7d6d2d..906d0a3e2f4 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index ba595100b5f..20bb329ff0e 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index b71d2697b85..2063a310fb8 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index 61d63046fac..a99b42859c7 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -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: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index 0e20201f4cb..f0e0a065089 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.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_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 154f0b51006..06af8a78575 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.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_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1dc4941012a..1c5d5c30173 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -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: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index a208aa5fff0..e43f4cb118c 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -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: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index f60029ee290..e4eb41f3bb4 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.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_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 2833920b746..463675b10b7 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -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: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index 7987ca819c1..fc998bd6edb 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.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_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index e027d471e23..1e9b0495d34 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -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: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ +-- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index 8b279dc578b..b899c4303e1 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.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_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 684c5aa5a7c..5d6d86617e6 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -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: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index cdccf3eb6ec..6de1b23eb64 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.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_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index fee45753759..04491e0878c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -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: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 9401f679071..575930a728c 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -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: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 757e8d2b447..46b769b8afc 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.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_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index d0118ebdc6c..e1b82141ea1 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 57d92bc8ce9..19824c860de 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 6f2ddcf56b9..455916a3010 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.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_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 6cf13137710..94e726796c5 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.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_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index cee3ace0ec3..8dbbb572f29 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -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: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 34d0bbac03b..923c2441987 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.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_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index ef97e48a251..88cf83a3cc3 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -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: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index b674a0cf11d..68e21d26061 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -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: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index 5e3620cba87..f289b9cb514 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -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: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index bd3c0c7d780..a2e54d34770 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -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: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index 1524eb7a77b..dbeec277f88 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -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: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index 75a4ce8fd06..e3e5900fb74 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.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_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index eafe6bd31e1..0669065b7d3 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -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: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index 6a06c0c70b5..dcca0174817 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -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: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index d4aa4b26d99..99cf1edd744 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.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_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index b55d734674f..415b44c6a35 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -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: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index 22a5b9d5c52..ba8b40b3c0a 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -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: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 5edbea4808d..40e131fefdf 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,9 +15,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_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index 5313952606a..bc11ca42c8f 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -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: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index c210f906b9b..8d4a4ecdcbf 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,9 +15,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_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index 29598bb4963..f43ab1e746a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.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_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index cfaad1061df..a52d3ed4a8b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -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: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 521d666742d..4e9f0d1da0e 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -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: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index 29af17f7c08..c9891219f4f 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,9 +15,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_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 917d6fc5cdf..6b8f7176dee 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -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: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 87245438b4d..399dd175311 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,9 +15,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_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index 373267c8921..c06074d4709 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,9 +15,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_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index b67427b9de8..1e3f21d0eb7 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.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_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 8f00ee95200..08450aa204f 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -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: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index edc76a392b0..9b0104ccfe5 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.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_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 302248ae299..0782e089170 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -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: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 9c741080a27..68b6cd9a315 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 4dd0ae15ad4..177be65fb88 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index ffc0666074d..d573c90eb18 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -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: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index 96f122e59cd..e0b2c2494ad 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -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: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 4beccac04b8..92000240642 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -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: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 484cebf6a2a..6240a2ed5c0 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -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: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index a56201f7dba..e2c4be38a5f 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -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: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 84f6077e5ba..51e133a86dc 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.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_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index 46685416239..aab9c69c1a7 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -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: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index 1d41d1ab59e..dc9732c0719 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -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: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index d6dd854a240..663adaffe60 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -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: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 0b7d6a61f56..73dc6489461 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -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: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index c1ee00edd07..0b42446740b 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.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_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index d694d696801..7d728850185 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -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: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index 925ca9eee81..d062249c3b8 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f67337de388..f33c92ea7fe 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 8c8454fbc28..92f21a35f28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.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_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index 6c673570cfc..e62275df23d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -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: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 9c05ed97a8d..29ad3853f90 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Oc�bo +-- Copyright (C) 2005 Marc Barilley / Ocbo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -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: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b127b194fa5..b9ba378d81f 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -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: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 5c8ea94ed09..8771b0ddda8 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.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_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 94ba92d4856..8bb011f7280 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.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_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 4017ae32682..1aba5d286d1 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -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: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index 2c77ae3447c..e0c4fd61701 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -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: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 52c0a3e2a03..1e721e86788 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.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_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index 439b2a68098..d4ea3ad5535 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.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_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index f01b7d02e8e..6f8d6a8cf97 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -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: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index bd1e805aed2..854ec6e826e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.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_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index bfc2162ceca..f1e90520593 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.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_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 784e3d37507..15d3bda5ba2 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -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: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 029bc528b6e..66a61851cae 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,9 +15,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_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 9c066c54436..195d2464738 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.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_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index f4e38524d25..44a301a2db7 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -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: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index f03d92ce651..237b5c23030 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.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_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 2c9c2d929db..3bec7551161 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index d9e9ecd43a7..45845593162 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 01cabfec865..672374961d5 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -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: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index 696cf49c337..d8d9443595d 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -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: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index 170bd56f390..f21fed4d1af 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -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: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index 5a3d71b489a..a501b4db4b6 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -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: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index d29449c2503..41a91a9aa5f 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.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_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index 86f114d395b..e12dbc6fb12 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -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: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index ce320558709..1a83bee6508 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -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: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 76f76ff08ed..93a28593f8e 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -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: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index 133687c7466..ec2bb01863b 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -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: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 6ccd3aa39fb..552a985abd4 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -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: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index e24a8918c5b..63b28ac8410 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -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: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index 26e451271cb..e7ccde53858 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -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: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index 40b07d29305..a1619df5cb5 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -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: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index e21669e63d7..309c60b660f 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.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_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index d094512d975..c92472f7af5 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -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: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index a75fb9aa76d..3fb70995900 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,9 +15,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_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ +-- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index a0d88737e3f..e7fc66a0ed6 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.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_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 9e28a37d6bb..57b252ed2ea 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -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: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index 376447586c9..b8453ea821c 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.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_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index e7528a03f28..00268974476 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -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: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 4f994cf57aa..16bf4dea7f0 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.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_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index 1a7fdfd755f..eff6387abee 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,9 +15,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_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index a618e3d8790..f53599483a4 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -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: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index 902f2b4fd5f..b9643f019c3 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.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_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index 1f5500e2eb1..db4cdd2581c 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -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: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index c7d84e27326..6bf45f749f5 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 523eb3b37e0..7db41de673c 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index bf057b4ad75..8dc4636c87e 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -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: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index ade6a40a80d..d500fc1b7cb 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.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_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index bca670bbb98..a515ba541bf 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -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: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index 7481589df00..b742b82dafc 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -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: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index 4adaa1a56ff..fff909a0ec8 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -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: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index 16631c76b76..fb65e9b7e84 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -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: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 3df14473a7e..332b1305d38 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.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_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index c3958313ea3..ca4206eb6fc 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -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: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 910d2ab2072..68e1d4f20e9 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -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: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 5c7f2e9a59c..8714e7e4a07 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -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: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index cbaadb10091..7d3b0eecd98 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.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_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index e88665b5a34..8bdd7193d1a 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -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: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 86916c216a2..367d45e8525 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -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: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 23065b261c8..28b28aeb762 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -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: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index 3f58eaf698b..d78db14c30b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -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: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 18924ff6ac5..68e46fd120d 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.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_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 8056a150fc3..6acb2db4585 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.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_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 1b5ea5516d4..838f502bfdb 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -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: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index e61985c7dd1..f21099e9c5e 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -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: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index 7bf81b7fbe9..f771be5ef5a 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.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_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 1fb0d708dfa..0033bca36bc 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.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_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 6df43634ec4..8037c9cd7e5 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -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: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 7b6cbd91645..99234b6660f 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index 810781ed6d9..dca8e80f856 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index 2e89f083575..f3a58aa1433 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.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_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index fd656c736ef..98c56c37567 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -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: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 87f6416c6c5..100d9fe82b0 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -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: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- ============================================================================ CREATE LANGUAGE plpgsql; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 9c4c3b41812..b588fe56702 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/upgrade2.php * \brief Upgrade some data - * \version $Id: upgrade2.php,v 1.187 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: upgrade2.php,v 1.186 2011/07/28 15:30:27 eldy Exp $ */ include_once('./inc.php'); diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html new file mode 100644 index 00000000000..38e0f007a15 --- /dev/null +++ b/htdocs/langs/es_ES/html/gpl.html @@ -0,0 +1,330 @@ + + + + + + + + +H. Licencia Pública GNU + + + + + + + + + + + + + +

          Licencia Pública GNU

          + + + + +
          + +GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 + +
          + +

          Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, + MA 02139, USA.

          +

          Está permitido, a cualquier persona, copiar y distribuir copias tal cual de + este documento de licencia, sin la introducción de cualquier cambio. +

          + +
          +

          Introducción

          +

          Las licencias de muchos softwares se desarrollan para asegurar la libertad + de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, + al contrario, pretende garantizar la libertad de compartir y alterar softwares + de libre distribución - volviéndolos de libre distribución también para cualquier + de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares + de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla + (algunos softwares de la FSF son cubiertos por la GNU Library General Public + License).

          +

          Cuando nos referimos a softwares de libre distribución, nos referimos a la + libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar + la libertad de distribución de copias de softwares de libre distribución (y + cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos + fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se + hacen algunas restricciones, para asegurar los derechos de los programadores, + prohibiendo a todas las personas su negación o la solicitación de su abdicación. + Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución + o modificación del software.

          +

          Por ejemplo, al distribuirse copias de determinado programa, por una tasa + determinada o gratuitamente, se debe informar sobre todos los derechos incidentes + sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia + Pública General GNU.

          +

          La protección de los derechos envuelve dos pasos: (1) copyright del software + y (2) licencia que da permiso legal para copia, distribución y/o modificación + del softwares.

          +

          Aún para la protección de la FSF y del autor es importante que todos entiendan + que no hay garantías para softwares de libre distribución. Si software se modifica + por alguien y lo pasa adelante, este software no más reflejará el trabajo original + del autor no pudiendo, por consiguiente, ser garantizado por aquél.

          +

          Finalmente, cualquier programa de libre distribución está constantemente amenazado + por las patentes de softwares. Buscamos evitar el peligro de que distribuidores + de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. + Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación + de patente se debe hacer permitiendo el uso por cualquier individuo, sin la + necesidad de licencia de uso.

          +

          Los términos y condiciones precisas para copia, distribución y modificación + siguen abajo:

          +
          +

          Licencia Pública General GNU

          +

          TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN +

          + +
            + +

          1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga + un aviso colocado por el detentor de los derechos de autor diciendo que aquel + podrá ser distribuido en las condiciones de la Licencia Pública General. El + Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado + en un Programa y significa tanto el propio Programa, como cualquier de los + trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, + un trabajo que contenga el Programa o una parte de este, en su forma original + o con modificaciones o traducido para una otra lengua (la traducción está + incluida sin limitaciones en el término ``modificación'').

            +

            Actividades distintas de copia, distribución y modificación no están cubiertas + por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa + no está restringido y la salida del Programa está cubierta solamente en + el caso de que su contenido contenga trabajos basados en el Programa (independientemente + de que hayan sido creados por la ejecución del Programa). Si esto es así, + depende de las funciones ejecutadas por el Programa.

            2. + +

          2. El código fuente del Programa, de la forma como fue recibido, puede ser + copiado y distribuido, en cualquier media, desde que sea providenciado un + aviso adecuado sobre los copyrights y la negación de garantías, y todos los + avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, + estén inalterados y que cualquier producto oriundo del Programa esté acompañado + de esta Licencia Pública General.

            +

            Está permitido el cobro de tasas por el acto físico de transferencia o + grabación de copias, y pueden ser dadas garantías y soporte en cambio del + cobro de valores.

            3. + + +
          3. +

            Se puede modificar la copia o copias del Programa de cualquier forma que + se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir + tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

            + +
              +

            1. Debe existir un aviso destacado de que los datos originales fueron alterados + en los archivos y las fechas de los cambios;

              2. + +

            2. Debe existir un aviso de que el trabajo distribuido o publicado es, + de forma total o parcial, derivado del Programa o de alguna parte suya, + y que puede ser licenciado totalmente sin costes para terceros bajo los + términos de esta Licencia.

              3. + +

            3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, + en el inicio de tu ejecución, presentar la información de copyright y + de ausencia de garantías (o de que la garantía es de responsabilidad de + terceros), y que los usuarios pueden redistribuir el programa bajo estas + condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

              4. +
            + + Estos requisitos se aplican a trabajos de modificación en general. Si + algunas secciones identificables no sean derivadas del Programa, y pueden + ser consideradas como partes independientes, entonces esta Licencia y sus + Términos no se aplican a aquellas secciones cuando distribuidas separadamente. + Pero al distribuir aquellas secciones como parte de un trabajo basado en + el Programa, la distribución, como un todo, debe contener los términos de + esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no + a cada una de las partes independientemente de quem los tenga desarrollado. + Más que tener intención de contestar los derechos sobre el trabajo desarrollado + por alguien, esta sección objetiva propiciar la correcta distribución de + trabajos derivados del Programa. + Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado + en él ni a un trabajo basado en él, a un volumen de almacenaje o media de + distribución no obliga la utilización de esta Licencia y de sus términos + al trabajo. +
            4. + + +
          4. +

            Están permitidas, la copia y la distribución, del Programa (o un trabajo + basado en éste) en la forma de código objeto o ejecutable de acuerdo con los + términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

            + +
              +

            1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos + en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada + para manejo de softwares o

              +
              2. +

            2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, + de poner a disposición a terceros, por un coste no superior al coste del + medio físico de almacenaje, una copia completa de los códigos fuente en + medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

              +
              3. +

            3. Esté acompañada con la misma información recibida en relación con la + oferta de la distribución del código fuente correspondiente (esta alternativa + solamente está permitida para distribuciones no comerciales y solamente + si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, + de acuerdo con la sección 2 arriba).

              +
              4. +
            + El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones + en aquel trabajo. Cuando se habla en códigos fuentes completos significa + hablar de todos los fuentes de todos los módulos, además de las definiciones + de interfaces asociadas, archivos, scripts utilizados en la compilación + y instalación del ejecutable. Como una excepción excepcional, el código + fuente distribuido podrá no incluir algunos componentes que no se encuentren + en su escopo, como compilador, kernel, etc... para el SO donde el trabajo + sea ejecutado. + Si la distribución del ejecutable o objeto se hace, a través de acceso + a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente + de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos + con los objetos simultáneamente +
            5. + +
          5. +

            No está permitida la copia, modificación, sublicenciamiento o distribución + del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier + tentativa de copia, modificación, sublicenciamiento o distribución del Programa + está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. + Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, + no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas + de esta Licencia.

            6. +
          6. +

            No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá + documento o contrato que garantice permiso de modificación o distribución + del Programa o sus trabajos derivados. Estas acciones están prohibidas por + ley, en el caso de que no se acepten las condiciones de esta Licencia. La + modificación o distribución del Programa, o cualquier trabajo basado en éste, + implica en la aceptación de esta Licencia y de todos los términos de ésta + para copia, distribución o modificación del Programa o trabajos basados en + éste.

            7. +
          7. +

            Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), + el recipiente automáticamente recibe una licencia del detentor original de + los derechos de copia, distribución o modificación del Programa objeto de + estos términos y condiciones. No pueden ser impuestas otras restricciones + en los recipientes.

            8. + +
          8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes + o derechos de autor, se impongan restricciones, que contradigan esta Licencia, + estos no exentan de su aplicación. Si no es posible distribuir el Programa + de forma a garantizar simultáneamente las obligaciones de esta Licencia y + otras que sean necesarias, entonces el Programa no podrá ser distribuido. +

            Si esta Sección se considera, inválida por cualquier motivo particular + o general, su resultado implicará en la invalidación general de esta licencia + en la copia, modificación, sublicenciamiento o distribución del Programa + o trabajos basados en éste.

            +

            El propósito de esta sección no es, de forma alguna, incitar a quien quiera + que sea a infringir derechos reclamados en cuestiones válidas y procedentes, + y si proteger las premisas del sistema de libre distribución de software. + Muchas personas tienen hecho contribuciones generosas al sistema, en la + forma de programas, y es necesario garantizar la consistencia y credibilidad + del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución + de los softwares.

            +

            Esta sección pretende hacer claro los motivos que crearan las demás cláusulas + de estas Licencia.

            9. + +
          9. +

            Si la distribución del Programa, dentro de los términos de esta Licencia, + tiene restricciones en algún País, por patentes o derechos de autor, el detentor + original de los derechos de autor del Programa bajo esta Licencia puede adicionar + explícitamente limitaciones geográficas de distribución, excluyendo aquellos + Países, haciendo con que la distribución solamente sea posible en los Países + no excluidos.

            10. + +
          10. +

            La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) + puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública + General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos + objetivos y el espirito de la presente versión, pudiendo variar en detalles + referentes a nuevas situaciones encontradas.

            +

            A cada versión se da un número distinto. Si el Programa especifica, un + número de versión determinado de esta Licencia, que tenga en su contenido + la expresión ``o versión más actualizada'', es posible optar por las condiciones + de aquella versión o de cualquier versión más actualizada publicada por + la FSF.

            11. + +
          11. +

            Si deseas incorporar parte del Programa en otros programas de libre distribución + de softwares hace falta autorización formal del autor. Para softwares que + la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde + que mantenido el espirito y objetivos originales de esta Licencia.

            12. +
          + +

          AUSENCIA DE GARANTÍAS

          +
            +

          1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER + GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE + EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS + DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, + LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD + Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS + CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y + REPAROS JUZGADOS NECESARIOS.

            2. +

          2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR + LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN + RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE + HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS + O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES + O DAÑOS.

            +

            FIN DE LA LICENCIA

          + + +
          +

           

          +

          Apéndice

          +

          ¿Cómo aplicar estos términos a nuevos softwares?

          +

          Si has desarrollado un nuevo programa y deseas su amplia distribución para + el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, + que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

          +

          Para esto basta con anexar este aviso al programa. Se recomienda indicar aún + en el inicio de cada archivo fuente la ausencia de garantías y una anotación + de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

          +

          <nombre del programa y función> Copyright (C) 199X <Autor> +

          +

          Este programa es un software de libre distribución, que puede ser copiado + y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo + con la publicada por la Free Software Foundation, versión 2 de la licencia o + (a criterio del autor) cualquier versión posterior.

          +

          Este programa se distribuye en la expectativa de ser útil a sus usuarios, + pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE + ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General + 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. +

          +

          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:

          +

          Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares + NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software + de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. + Teclea 'muestra condic' para mayores detalles.

          +

          Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las + partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos + pueden variar o pueden ser accionados por otras interfaces como clic de ratón, + etc...

          +

           

          +
          +
          + +www.conectiva.com + +
          + + + + + diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt new file mode 100644 index 00000000000..3efbe1ccee7 --- /dev/null +++ b/htdocs/langs/nl_BE/html/gpl.txt @@ -0,0 +1,340 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +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 new file mode 100644 index 00000000000..778e2b02b41 --- /dev/null +++ b/htdocs/langs/nl_NL/html/gpl.txt @@ -0,0 +1,339 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van +deze licentie. \ No newline at end of file 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/ajax.lib.php b/htdocs/lib/ajax.lib.php index 55def736688..7db1908bc49 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ */ diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index e2a33296bee..263e18df269 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -16,7 +16,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ @@ -24,7 +25,7 @@ * \file htdocs/lib/pdf.lib.php * \brief Set of functions used for PDF generation * \ingroup core - * \version $Id: pdf.lib.php,v 1.99 2011/07/31 23:25:42 eldy Exp $ + * \version $Id: pdf.lib.php,v 1.98 2011/07/27 17:28:42 eldy Exp $ */ diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index d6bf7267439..454073d9730 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 6e1e7b262f4..b5304ba4198 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index b0a7c2dece6..bda35165079 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.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/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ + * \version $Id$ */ if (session_id() == "") session_start(); 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/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index edb62d728d5..78ca25e85a6 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $ + * \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index c15f65c5630..9af151bc40a 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.89 2011/07/31 23:22:05 eldy Exp $ + * \version $Id: style.css.php,v 1.88 2011/07/28 13:22:19 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/freelug/style.css.php b/htdocs/theme/freelug/style.css.php index bca03dc2770..928700d2f7a 100644 --- a/htdocs/theme/freelug/style.css.php +++ b/htdocs/theme/freelug/style.css.php @@ -13,13 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/freelug/style.css.php * \brief Fichier de style CSS du theme Freelug - * \version $Id: style.css.php,v 1.44 2011/07/31 23:22:05 eldy Exp $ + * \version $Id: style.css.php,v 1.43 2011/07/28 13:31:58 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index e78dff8f646..f93935ffb16 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.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/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ + * \version $Id$ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php index 6e14cbf8e12..74a4705b691 100644 --- a/htdocs/theme/yellow/style.css.php +++ b/htdocs/theme/yellow/style.css.php @@ -13,13 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/yellow/style.css.php * \brief Fichier de style CSS du theme Yellow - * \version $Id: style.css.php,v 1.46 2011/07/31 23:22:04 eldy Exp $ + * \version $Id: style.css.php,v 1.45 2011/07/28 13:31:58 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/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 fb4b85a0aa9..143af8934c7 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -14,7 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ @@ -22,7 +23,7 @@ * \file htdocs/viewimage.php * \brief Wrapper to show images into Dolibarr screens * \remarks Call to wrapper is '' - * \version $Id: viewimage.php,v 1.97 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: viewimage.php,v 1.96 2011/07/28 13:56:17 eldy Exp $ */ // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). From 8d5617a943cfa08d605a714ad412b6f590f3b1b3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 30 Jul 2011 14:56:11 +0000 Subject: [PATCH 019/118] Work on 3.1 packaging --- build/deb/README | 5 +- build/deb/changelog | 7 +- build/deb/control.DEBIAN | 46 - build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 + build/deb/install | 1 + build/deb/po/fr.po | 22 +- build/deb/po/templates.pot | 20 +- build/deb/postrm | 51 +- build/deb/templates | 7 + build/makepack-dolibarr.pl | 152 +-- build/rpm/README | 13 +- build/rpm/dolibarr.desktop | 3 +- build/rpm/dolibarr.spec | 173 +-- build/rpm/file_contexts.dolibarr | 6 +- build/rpm/install.forced.php.install | 5 +- dev/skeletons/modMyModule.class.php | 4 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 35 +- htdocs/admin/perms.php | 34 +- htdocs/admin/proxy.php | 7 +- htdocs/admin/security_other.php | 7 +- htdocs/admin/system/constall.php | 5 +- htdocs/boxes.php | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/tpl/validation1.tpl.php | 21 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/compta/prelevement/create.php | 7 +- htdocs/core/class/html.form.class.php | 11 +- htdocs/core/class/interfaces.class.php | 5 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 ++++++++--------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/install/default.css | 5 +- htdocs/install/etape5.php | 4 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 5 +- .../mysql/data/llx_20_c_departements.sql | 5 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- .../install/mysql/data/llx_c_currencies.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/data/llx_c_tva.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_departements.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_regions.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- htdocs/install/mysql/tables/llx_commande.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../mysql/tables/llx_commande_fournisseur.sql | 5 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/install/upgrade2.php | 5 +- htdocs/langs/es_ES/html/gpl.html | 330 ------ htdocs/langs/nl_BE/html/gpl.txt | 340 ------ htdocs/langs/nl_NL/html/gpl.txt | 339 ------ htdocs/lib/admin.lib.php | 77 +- htdocs/lib/ajax.lib.php | 5 +- htdocs/lib/pdf.lib.php | 5 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/societe/soc.php | 10 +- htdocs/theme/auguria/style.css.php | 5 +- htdocs/theme/eldy/style.css.php | 5 +- htdocs/theme/freelug/style.css.php | 5 +- .../smartphone/theme/default/default.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 +- 339 files changed, 1570 insertions(+), 2806 deletions(-) delete mode 100755 build/deb/control.DEBIAN delete mode 100644 htdocs/langs/es_ES/html/gpl.html delete mode 100644 htdocs/langs/nl_BE/html/gpl.txt delete mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index edb46ffd5a3..d73d7a99219 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build package +# dpkg -b To build binary only package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# +# dpkg-reconfigure -plow package Reconfigure package # dpkg -L packagename List content of installed package +# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index b035f18ae1d..420975c16ec 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -1,9 +1,8 @@ -dolibarr (3.1.0-1.1) unstable; urgency=low +dolibarr (3.1.0) unstable; urgency=low - * Non-maintainer upload * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 + -- Laurent Destailleur Mon, 18 Jul 2011 12:00:00 +0100 -# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file +# More information into /usr/share/dolibarr/ChangeLog file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN deleted file mode 100755 index 7c66775bdf1..00000000000 --- a/build/deb/control.DEBIAN +++ /dev/null @@ -1,46 +0,0 @@ -Package: dolibarr -Version: __VERSION__ -Architecture: all -Maintainer: Laurent Destailleur -Installed-Size: 61200 -Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl -Section: web -Priority: optional -Homepage: http://www.dolibarr.org -Description: Easy to use web based ERP & CRM software - Dolibarr ERP & CRM is an easy to use open source/free software for small - and medium companies, foundations or freelances. It includes different - features for Enterprise Resource Planning (ERP) and Customer Relationship - Management (CRM) but also for different other activities. - It's a web software you can install as a standalone program or on any web - hosting provider to use it from anywhere with any web browser. - Dolibarr was designed to provide only features you need and be easy to use. - . - Only features you need are visible, depending on which module were activated. - Most common used modules are: - . - Customers, Suppliers or Prospects directory, - Contacts directory, - Orders management, - Commercial proposals management, - Invoices management, - Products and services catalog, - Stock management, - Foundations members management, - Bank accounts management, - Point of Sale, - Payments management, - Commercial actions management, - Contracts management, - Standing orders management, - Shipping management, - Donations management, - Bookmarks management, - Mass Emailings, - Reports, - Wizards to export and import data, - LDAP connectivity, - PDF exports, - And a lot of more modules... - . - You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index 91f0705c001..e28258d8dbc 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,10 +4,16 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper, po-debconf +Build-Depends: debhelper (>= 7), po-debconf Package: dolibarr -Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, + php5-mysql | php5-mysqli, + php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, + ${misc:Depends}, xdg-utils, + mysql-server, perl +Recommends: apache2 | lighttpd | httpd, mysql-client +Suggests: www-browser Architecture: all Section: web Priority: optional diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index a48e5048dff..f4b471edf13 100644 --- a/build/deb/dolibarr.desktop +++ b/build/deb/dolibarr.desktop @@ -3,10 +3,14 @@ # It must be saved into directory /usr/share/applications Version=1.0 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM +Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations +Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/deb/install b/build/deb/install index 4d41fd52c65..2928d378abc 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,4 +1,5 @@ etc/dolibarr/apache.conf +etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 13b8030ed0d..3bbe762283a 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:49+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,10 +25,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "Seveur web à reconfigurer automatiquement:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" +"Selectionnez le serveur web à configurer automatiquement pour utiliser " +"dolibarr." + # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -36,7 +52,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index 32c92a97cc4..d65e5d8b7f6 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:52+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,15 +17,29 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: multiselect #. Description #: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:2001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postrm b/build/deb/postrm index 9eae81b022b..95f27de27dd 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -30,7 +30,6 @@ 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="" @@ -44,32 +43,6 @@ esac 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 apacheconfig=$apacheconfig" @@ -225,6 +198,30 @@ case "$1" in #db_purge ;; + # Call when we uninstall + remove) + rm -f /usr/share/dolibarr/install.lock + + # 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 + ;; + + upgrade) + ;; + failed-upgrade|abort-install|abort-upgrade|disappear) ;; diff --git a/build/deb/templates b/build/deb/templates index 5c06afd8ccd..b96325a4e64 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,3 +1,10 @@ +Template: dolibarr/reconfigure-webserver +Type: multiselect +Choices: apache2, lighttpd +_Description: Web server to reconfigure automatically: + Please choose the web server that should be automatically configured + to run dolibarr. + Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index d3c47e6b28d..a791fd3f828 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.128 2011/07/31 22:08:13 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.123 2011/07/30 14:56:12 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -11,7 +11,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="1"; -$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="auto"; # auto use value found into BUILD @LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.123 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -254,11 +254,9 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliW*-*`; $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliM*-*`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.changes`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`; @@ -276,10 +274,6 @@ 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`; @@ -416,19 +410,14 @@ if ($nboftargetok) { } if ($target eq 'RPM') { # Linux only - #$ARCH='i386'; - $ARCH='noarch'; + $ARCH='i386'; if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; } $newbuild = $BUILD; - # For fedora - $newbuild =~ s/(dev|alpha)/0.1.a/gi; # dev - $newbuild =~ s/beta/0.2.beta1/gi; # beta - $newbuild =~ s/rc./0.3.rc1/gi; # rc + $newbuild =~ s/(dev|alpha)/0/gi; # dev + $newbuild =~ s/beta/1/gi; # beta + $newbuild =~ s/rc./2/gi; # rc if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale - #$newbuild =~ s/(dev|alpha)/0/gi; # dev - #$newbuild =~ s/beta/1/gi; # beta - #$newbuild =~ s/rc./2/gi; # rc - #if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale + # now newbuild is 0-0 or 0-3 for example $REL1 = $newbuild; $REL1 =~ s/-.*$//gi; if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; } print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; @@ -446,93 +435,16 @@ 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 -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$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`; @@ -560,10 +472,6 @@ 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; } @@ -700,7 +608,17 @@ if ($nboftargetok) { print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`; - # Set owners + #print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n"; + #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`; + + # copyright (to build binary package directly without sources. Useless if we build from sources) + #print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n"; + #$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`; + + # changelog (to build binary package directly without sources. Useless if we build from sources) + #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`; + #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`; + print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`; @@ -757,7 +675,7 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`; $ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`; $ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/debian/po"`; - $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`; + $ret=`rm -fr "$SOURCE/build/deb/po/CVS"`; # Add files also required to build binary package with dpkg-buildpackages $ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`; @@ -778,18 +696,12 @@ if ($nboftargetok) { if ($OS =~ /windows/i) { print "Move *_all.deb to $DESTI\n"; - $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; - $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; - $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; - $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; + $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; } else { print "Move *_all.deb to $DESTI\n"; - $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; - $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; - $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; - $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; + $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; } next; } diff --git a/build/rpm/README b/build/rpm/README index 99a1bb3552c..f20bf91db72 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -5,17 +5,24 @@ RPM Package tools This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, -with format RPM (for Redhat, Mandriva, ...). +with format RPM (for Redhat, OpenSuse, Mandriva, ...). -# This is standard command to work on Debian packaging: +# This is standard command to work on RPM packaging: +# +# yum -y install rpmlint +# yum -y install hunspell-en hunspell-es hunspell-fr hunspell-it # # rpmlint file.rpm Test a package +# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm # # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies -# yum erase dolibarr To remove package +# yum erase dolibarr To remove package +# chcon -R -h -t httpd_sys_script_rw_t /file To add temporary context rw for httpd on /file +# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" To add persistent context rw for httpd on /dir (this add file_contexts.local) +# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage) # # On OpenSuse # yast --install dolibarr-...rpm To install package and dependencies diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index 4b4fb60dadb..337b92d8049 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -4,13 +4,14 @@ Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti -Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 708546cf263..e6996caa4b3 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -5,6 +5,11 @@ # file to build a package for your own distributions and # edit it if you need to match your rules. # -------------------------------------------------------- + +#%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0) +#%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) +#%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0) + %define name dolibarr %define version __VERSION__ %define release __RELEASE__ @@ -12,9 +17,12 @@ Name: %{name} Version: %{version} Release: %{release} -Summary: Dolibarr +Summary: ERP and CRM software for small and medium companies or foundations +Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos +Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations +Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti -License: GPL +License: GPLv2+ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team @@ -56,13 +64,12 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Un software ERP y CRM open source/gratis para pequeñas y -medianas empresas, asociaciones o autónomos. Incluye diferentes -funcionalidades para la Planificación de Recursos Empresariales (ERP) y -Gestión de la Relación con los Clientes (CRM) así como para para otras -diferentes actividades. Dolibarr ha sido diseñado para suministrarle -solamente las funcionalidades que necesita y haciendo hincapié en su -facilidad de uso. +Un software ERP y CRM para pequeñas y medianas empresas, asociaciones +o autónomos. Incluye diferentes funcionalidades para la Planificación +de Recursos Empresariales (ERP) y Gestión de la Relación con los +Clientes (CRM) así como para para otras diferentes actividades. +Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades +que necesita y haciendo hincapié en su facilidad de uso. %description -l fr Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, @@ -71,12 +78,12 @@ fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Un programma gestionale open source e gratuito per piccole e medie +Un programmo gestionale per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori -attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno +attività. Progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. -Dolibar è completamente web-based, progettato per poter fornire solo ciò di +Programmo web, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. @@ -94,49 +101,51 @@ echo Building %{name}-%{version}-%{release} #---- install %install -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr +%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf +%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr # %{_datadir} = /usr/share -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +%{__install} -m 644 var/www/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications +%{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README -install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/doc $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/htdocs $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT #---- clean %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT #---- files %files + %defattr(-,root,root) -%doc README -%doc COPYRIGHT %doc /var/www/dolibarr/doc/* %dir /var/www/dolibarr/build %dir /var/www/dolibarr/htdocs %dir /var/www/dolibarr/scripts -%_datadir/pixmaps/* +%_datadir/pixmaps/dolibarr.png %_datadir/applications/%{name}.desktop /var/www/dolibarr/build/* /var/www/dolibarr/htdocs/* /var/www/dolibarr/scripts/* -/var/www/dolibarr/README -/var/www/dolibarr/COPYRIGHT -#%config /var/www/dolibarr/htdocs/conf/conf.php + +%defattr(0664, -, -, 0755) +%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf +%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr #---- post (after unzip during install) @@ -154,11 +163,11 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr" +export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="/usr/share/dolibarr/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="/usr/share/dolibarr/install.lock" # Detect OS @@ -192,8 +201,8 @@ echo OS detected: $os # Create empty directory for uploaded files and generated documents echo Create document directory $docdir -mkdir -p $docdir -mkdir -p %{_sysconfdir}/dolibarr +%{__mkdir} -p $docdir +%{__mkdir} -p %{_sysconfdir}/dolibarr # Create install.forced.php into Dolibarr install directory superuserlogin='' @@ -205,36 +214,39 @@ 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 ] then echo Create empty file $config touch $config - chown -R root:$apachegroup $config - chmod -R 660 $config + %{__chown} -R root:$apachegroup $config + %{__chmod} -R 660 $config fi # Create config file for apache $apacheconfig -if [ ! -f $apacheconfig ]; then - echo Create dolibarr web server config file $apacheconfig - cp $apachefileorig $apacheconfig - chmod a-x $apacheconfig - chmod go-w $apacheconfig -fi - -# Create config file for se $seconfig -if [ ! -f $seconfig ]; then - echo Create se config file $seconfig - cp $sefileorig $seconfig +#if [ ! -f $apacheconfig ]; then +# echo Create dolibarr web server config file $apacheconfig +# cp $apachefileorig $apacheconfig # chmod a-x $apacheconfig # chmod go-w $apacheconfig +#fi + +# Create config file for se $seconfig +if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then + echo Add SE Linux permission from file $sefileorig + semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" + semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" + semanage fcontext -a -t httpd_sys_script_rw_t "/var/www/dolibarr/install.lock" + restorecon -R -v /etc/dolibarr + restorecon -R -v /usr/share/dolibarr + restorecon -v /var/www/dolibarr/install.lock fi # Create a config link dolibarr.conf @@ -245,25 +257,13 @@ fi # Set permissions echo Set permission to $apacheuser:$apachegroup on $targetdir -chown -R $apacheuser:$apachegroup $targetdir -chmod -R a-w $targetdir -chmod u+w $targetdir +%{__chown} -R $apacheuser:$apachegroup $targetdir +%{__chmod} -R a-w $targetdir +%{__chmod} u+w $targetdir 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 +%{__chown} -R $apacheuser:$apachegroup $docdir +%{__chmod} -R o-w $docdir # Restart web server echo Restart web server @@ -274,6 +274,12 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then %{_sysconfdir}/init.d/apache2 restart fi +# Restart mysql +echo Restart mysql +if [ -f /etc/init.d/mysqld ]; then + /etc/init.d/mysqld restart +fi + # Show result echo echo "----- Dolibarr %version - (c) Dolibarr dev team -----" @@ -301,9 +307,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="$targetdir/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="$targetdir/install.lock" # Detect OS @@ -338,7 +344,7 @@ echo OS detected: $os if [ -f $apachelink ] ; then echo Delete apache config link for Dolibarr - rm -f $apachelink + %{__rm} -f $apachelink status=purge fi @@ -356,18 +362,15 @@ then fi # Removed dirs after apache restart -echo Removed remaining $apacheconfig -rm -f $apacheconfig echo Removed remaining $config -rm -f $config +%{__rm} -f $config echo Removed remaining $installconfig -rm -f $installconfig +%{__rm} -f $installconfig echo Removed remaining $lockfile -rm -f $lockfile +%{__rm} -f $lockfile echo Removed remaining dir $targetdir/doc rmdir $targetdir/doc >/dev/null 2>&1 -#echo Removed remaining dir $targetdir/htdocs -#rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm + %changelog * Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 diff --git a/build/rpm/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr index 64376e5afb6..193a43b7dbe 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -1,3 +1,3 @@ -/etc/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/var/www/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file +/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/var/www/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file diff --git a/build/rpm/install.forced.php.install b/build/rpm/install.forced.php.install index f01e5303ce0..5f390270b51 100755 --- a/build/rpm/install.forced.php.install +++ b/build/rpm/install.forced.php.install @@ -3,11 +3,10 @@ $force_install_noedit=2; $force_install_message='KeepDefaultValuesDeb'; $force_install_main_data_root='/usr/share/dolibarr/documents'; $force_install_type='mysqli'; -$force_install_dbserver='localhost'; $force_install_port='3306'; -$force_install_database='dolibarrrpm'; +$force_install_database='dolibarr'; $force_install_createdatabase='1'; -$force_install_databaselogin='dolibarrrpm'; +$force_install_databaselogin='dolibarrmysql'; $force_install_databasepass=''; $force_install_createuser='1'; $force_install_databaserootlogin='__SUPERUSERLOGIN__'; diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 3cc548e1c0a..d7172d651f0 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -27,7 +27,7 @@ * \file htdocs/includes/modules/modMyModule.class.php * \ingroup mymodule * \brief Description and activation file for module MyModule - * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $ + * \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); @@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='generic'; - // Defined if the directory /mymodule/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 718c842d046..34e7f48cea8 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -20,7 +20,7 @@ /** * \file htdocs/admin/boxes.php * \brief Page to setup boxes - * \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $ */ require("../main.inc.php"); @@ -278,7 +278,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -394,7 +394,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -470,5 +470,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $'); +llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $'); ?> diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index a907f47663a..671bd69a0e4 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2010 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ /** * \file htdocs/admin/modules.php * \brief Page to activate/disable all modules - * \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $ */ require("../main.inc.php"); @@ -79,12 +79,35 @@ $modules = array(); $orders = array(); $categ = array(); $dirmod = array(); +$modulesdir = array(); $i = 0; // is a sequencer of modules found $j = 0; // j is module number. Automatically affected if module number not defined. -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $althandle=@opendir($dirroot); + if (is_resource($althandle)) + { + while (($file = readdir($althandle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
          "; dol_syslog("Scan directory ".$dir." for modules"); @@ -449,5 +472,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $'); +llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $'); ?> diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index bee00b52906..6af9b54e7f0 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -21,7 +21,7 @@ * \file htdocs/admin/perms.php * \ingroup core * \brief Page d'administration/configuration des permissions par defaut - * \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $ + * \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $ */ require("../main.inc.php"); @@ -76,10 +76,34 @@ $db->begin(); // Charge les modules soumis a permissions $modules = array(); -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +$modulesdir = array(); +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
          "; $handle=@opendir($dir); @@ -194,5 +218,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $'); +llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $'); ?> diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 2c284c5cae8..f02e3d6203a 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ + * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -205,5 +206,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c1d629f7b7b..c0aaaa86213 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -347,5 +348,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index f478b65e3a8..a07b28bd2cf 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/system/constall.php * \brief Page to show all Dolibarr setup (config file and database constants) - * \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $ + * \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $ */ require("../../main.inc.php"); diff --git a/htdocs/boxes.php b/htdocs/boxes.php index 2affdf654d3..d426e618377 100644 --- a/htdocs/boxes.php +++ b/htdocs/boxes.php @@ -22,7 +22,7 @@ * \brief File of class to manage widget boxes * \author Rodolphe Qiedeville * \author Laurent Destailleur - * \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $ */ @@ -220,7 +220,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php"); + $sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); } else { @@ -281,7 +281,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index c79d46fbeb5..698cceb4966 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,11 +11,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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ -/* \version $Id$ */ +/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index f91946e11c0..2d89cfd2388 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.js @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ // Instanciation et initialisation de l'objet xmlhttprequest diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index f3a440b4929..b18bf124ae4 100644 --- a/htdocs/cashdesk/tpl/validation1.tpl.php +++ b/htdocs/cashdesk/tpl/validation1.tpl.php @@ -15,8 +15,7 @@ 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, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with this program. If not, see . -->
          trans("Summary"); ?> @@ -40,9 +39,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ?> trans("TotalTTC"); ?> prix_total_ttc(),'MT').' '.$conf->monnaie; ?> trans("PaymentMode"); ?> - mode_reglement()) - { + { case 'ESP': echo $langs->trans("Cash"); $filtre='courant=2'; @@ -53,7 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 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"); @@ -65,16 +64,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. echo $langs->trans("Reported"); $filtre='courant=1 OR courant=2'; $selected=''; - break; + break; default: $filtre='courant=1 OR courant=2'; $selected=''; } - + ?> - - mode_reglement() == 'DIF' ) { @@ -100,10 +99,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

          - 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/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 259dc4dbce5..96de90124f9 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -48,7 +47,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -67,7 +66,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -78,17 +77,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 0c262ba2936..5ba2ef8997e 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -385,5 +386,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 525160df9ef..9ee1f551048 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ + * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -607,5 +608,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index e05eaa66ecf..0efb704828f 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ + * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -1032,5 +1031,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index d2f2a7aae7e..5da397b4183 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ + * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ */ require('../main.inc.php'); @@ -673,5 +672,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); +llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); ?> diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 79d00ae00c7..689e2639773 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ + * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -275,5 +276,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); +llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index cb4a0f7a5cf..e24b3c7c717 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -23,15 +23,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $ + * \version $Id: html.form.class.php,v 1.193 2011/07/31 23:45:14 eldy Exp $ */ @@ -161,8 +160,10 @@ class Form $htmltext=str_replace("\n","",$htmltext); $htmltext=str_replace('"',""",$htmltext); - $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip - $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip + else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip + else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag $s=""; if (empty($notabs)) $s.=''; diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 8deeda0fb57..2ca2f82789e 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/interfaces.class.php * \ingroup core * \brief Fichier de la classe de gestion des triggers - * \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $ + * \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $ */ diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 257b95e4e3c..6f6c7ed2a1b 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -65,7 +64,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.30 $'); + $ver=explode(' ','$Revision: 1.31 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 127eb16e389..446606ef055 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -64,7 +63,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
          This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.27 $'); + $ver=explode(' ','$Revision: 1.28 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 9c90d1fcc94..46fa4c9ccc4 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,9 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* or see http://www.gnu.org/ +* along with this program. If not, see . */ /** @@ -22,7 +20,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id$ + * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -61,7 +59,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
          This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision$'); + $ver=explode(' ','$Revision: 1.14 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index ec7e1af07c6..7055bef4b69 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php index 42780551928..c7bab37ad4b 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.10 2011/07/31 23:28:10 eldy Exp $ + * \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis 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/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 1; // Data directories to create when module is enabled diff --git a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index b1e3f5a2638..067e831b0b4 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,504 +1,503 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; If not, see . + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index b1e3f5a2638..e5f0ff4c0e5 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + License along with this library; If not, see . Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 9978c8f437a..1d2084e7c7f 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: default.css,v 1.24 2011/08/03 01:32:42 eldy Exp $ */ body { diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 0037190af06..5e826a0f9f7 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -24,7 +24,7 @@ * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ + * \version $Id: etape5.php,v 1.104 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); @@ -315,6 +315,7 @@ if ($action == "set") if (! empty($force_install_lockinstall)) { // Install is finished, we create the lock file + $lockfile="../../install.lock"; $fp = @fopen($lockfile, "w"); if ($fp) { @@ -364,6 +365,7 @@ elseif (preg_match('/upgrade/i',$action)) if (! empty($force_install_lockinstall)) { // Upgrade is finished, we create the lock file + $lockfile="../../install.lock"; $fp = @fopen($lockfile, "w"); if ($fp) { diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 9d08a56e41c..275298588e2 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 1f046a29bc4..8ea28cbbcc3 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.14 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 9a109ab3fdc..4be9b6b7719 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.16 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index 56ceea3d807..da244f79951 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index 3a248c2f49f..eee5dfa185a 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index dcbaf2faaf4..e3922b97f65 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index 1dd3cb59a62..b7f6c71c87e 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,10 +11,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index 5e93e39d048..f3299990858 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index e3ed8196d17..1f14cc8c142 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 176e5c796e2..5017ce0c60d 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql index ad7c175fcc4..eeb2c376b85 100644 --- a/htdocs/install/mysql/data/llx_c_currencies.sql +++ b/htdocs/install/mysql/data/llx_c_currencies.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_c_currencies.sql,v 1.8 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index db630463dbf..f58db2b32a6 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index c67d263853d..079caa7dde4 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 07fa2abaa83..4bb81528e74 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index e29b3f306f5..720413ac480 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index c7fa6b6dd1f..cb0b557b438 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index 6a597996424..a3a19cc2125 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 78e174b9817..1ec498e6bc2 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a535a5098e..3a17978bb0c 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index f6395abbfcd..96d456312df 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 9c28f697f83..488b0a564eb 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index 988d9c26136..d8701c52c01 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ -- -- @@ -34,4 +33,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2d1a3c62a39..2fd47385a90 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 056dbdbdb6e..788e9e82f39 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_c_tva.sql,v 1.27 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index 4238000eb14..da98640fd25 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 6e596be24e5..789ad16fce2 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index e2faed3cba3..48b77951e1f 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index cf7e9e96275..59bd3d1ef00 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index 655848a50ae..cd2f27a5dca 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 968a131e2bb..42f86f1c447 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 6e6e960072b..685170362fd 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 02ff06ba9f1..921bc569980 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index f22262c9353..d5902b539c7 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index b2cdf08af5f..ddd3d734ff7 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 031bfb614e1..8c5c23bbe62 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index 3aa9555979e..f7b876eed86 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 4703aa32ddd..8d34e2a9c78 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index 69bf706ca68..ad6f448e3dc 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 9156b439833..51d66c04584 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index db64e0cbf9c..7df7f21a3b9 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index a7efcbd0f6d..31676d7d6e2 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index 7e4fa074e71..bc9d9ad0936 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index d23a1367f92..18eed730ab8 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index 2b2db5af657..ade41da746e 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index b5c9175202b..62a88236480 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 6ed1e00dd88..015a9e9b4c0 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index d1279c21eb2..296b49fc93f 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 822a69bc4ec..9cedf70e7ca 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index aba765190ee..55718d8ffb5 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index eded16c49fe..abc9baa2d8c 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index e39fbf71f12..3dd83585bcd 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 3710a87470a..217edcaddbb 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index ad41449f288..5869f24d8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index f6301a24919..5db17f19069 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index cd68a9cdb40..5f66ff625f0 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index 890c7597862..b0546729ef0 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index d67cf7fe4b8..4794113f8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5c06c73c69d..5fc25f57339 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 115bd310d70..5746cce26aa 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index d3c71cc4a70..ba1e56e2b94 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index 10c4cc2d853..de9c23e9c05 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,11 +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, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- --- $Id$ +-- $Id: llx_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index 09365976d78..cce9d04707b 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 463b1235094..93e8e3d99a7 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index c81a2b3e830..b0f31fe7116 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index 821fe3e5c04..cb2251cfaf6 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 9380607010d..8bebcf13116 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index e524d9c937a..b30354cae19 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index 0b0b34390c4..b026a40d762 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 7b5fa661d7d..39d21cee7b9 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index e2f225fe608..d1e6b216b4b 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 66cd5111325..60af7723f30 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index ebca12ab5da..cb223ae5532 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 3872bedd39d..415b8526793 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index bed4ad41dfc..5c54695f608 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 23cd0f575ed..93ef5d59770 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index f46d2a56c33..7702a8cf21e 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_departements.sql b/htdocs/install/mysql/tables/llx_c_departements.sql index ab0ea5dc0c3..ea1f7543428 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_departements.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ +-- $Id: llx_c_departements.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_c_departements diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 4669de108f4..46a35567e95 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index a6bb8ca70f7..c2c43a3a625 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 5637e5a987d..547500d7f33 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index 884d8274cfd..bf7ed18af80 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index 2b6dea6cbd3..d0dceaf0fe1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 76aecebbb9a..192183be0c1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index 665a210d74b..d6d673962b9 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index 7fcd57e31eb..c8deefef6d7 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index e1cab3b3368..757653f1fc2 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f97e458be6b..f2fb7fda4d3 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 165a8550331..7a228ec1572 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 6efa388ef81..120e27ae77d 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index c8824b2d04e..a5e3fd8721b 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 311183c87f4..418e37a85b1 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 2d00f620e02..1cc5dbfaf0e 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 02052920c8a..84c72e0839b 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 0f608cbc171..8cf0ec900f8 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 75b40946559..2eed307bc54 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql index d9d0f2d1b0c..5ef6fb221e6 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_regions.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ +-- $Id: llx_c_regions.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_c_regions diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index 76caf44356d..c977dd9dd21 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 861671e3607..8307ca88eb6 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 46504e8a1c4..9a7bda88c28 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index dc284fc8cea..725ddbfeb90 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index 4f8736a3a14..a1feeb33f8b 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -13,8 +13,7 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -24,7 +23,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 85ea592d950..1e141b7768a 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 9fad6cc333e..79d54faf623 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index d6bd27758b4..97638937c74 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 40759cdc50b..211af70a854 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 80e73c43399..7c4c534451d 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index 4c466e0c02b..f2330322a5f 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 46a39b3c9e7..8e4492c28a9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 60641bf1876..39be52cf374 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index cfe126b5adf..e93ce9b4354 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index 7e12e06beb7..baa01289b96 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index 83eb804c875..bd19d25f1a5 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index 6236e113766..eb95b9fe66c 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index cf5121c34f9..2c95fde3255 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index cabdcce3a80..d62011351c4 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index ebaf9582414..a07ff049d61 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index fa9a85aac1f..730bc11ac98 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index ec8931763bf..6f129f2feec 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 9c6e2a065f8..731cf8fb0f4 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_commande.sql,v 1.13 2011/07/28 22:22:31 eldy Exp $ +-- $Id: llx_commande.sql,v 1.14 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_commande diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 7958b56f354..172a2432ee1 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ --- Supprimme orphelins pour permettre monte de la cl +-- Supprimme orphelins pour permettre mont�e de la cl� -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index 3ef51d6ae21..f1c8c7ac579 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_commande_fournisseur.sql,v 1.7 2011/07/28 22:22:31 eldy Exp $ +-- $Id: llx_commande_fournisseur.sql,v 1.8 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index 3f848c9ffe2..c13c0aa6019 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index df6d49827f6..f0c65456e5c 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index 9bb45f9d326..be4e60a9a97 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 91914ab66c7..23cfd068495 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b39863cab..d1b18165255 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index e964fbc2f5e..19ec675f973 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a747c714fb3..a53a24d9a66 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 16ecb365d6c..46639ca7c1e 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index bfce896eb19..d1ba0645e05 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index 51234007ee1..b7fc52403af 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index eead2907fa2..4187f526393 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 1c757fa6c86..7b74d8b506d 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ --- Supprimme orhpelins pour permettre monte de la cl +-- Supprimme orhpelins pour permettre mont�e de la cl� -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index 79b52ba399c..f1f4a75b604 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 3757e4522bf..39b89773316 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index f5987250001..98b29b1f715 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 9c4a5e340ab..0eb566317d0 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 906d0a3e2f4..3fb9f7d6d2d 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index 20bb329ff0e..ba595100b5f 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index 2063a310fb8..b71d2697b85 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index a99b42859c7..61d63046fac 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index f0e0a065089..0e20201f4cb 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 06af8a78575..154f0b51006 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1c5d5c30173..1dc4941012a 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index e43f4cb118c..a208aa5fff0 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index e4eb41f3bb4..f60029ee290 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 463675b10b7..2833920b746 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index fc998bd6edb..7987ca819c1 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index 1e9b0495d34..e027d471e23 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ +-- $Id: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index b899c4303e1..8b279dc578b 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 5d6d86617e6..684c5aa5a7c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index 6de1b23eb64..cdccf3eb6ec 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index 04491e0878c..fee45753759 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 575930a728c..9401f679071 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 46b769b8afc..757e8d2b447 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index e1b82141ea1..d0118ebdc6c 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 19824c860de..57d92bc8ce9 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 455916a3010..6f2ddcf56b9 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 94e726796c5..6cf13137710 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index 8dbbb572f29..cee3ace0ec3 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 923c2441987..34d0bbac03b 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index 88cf83a3cc3..ef97e48a251 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index 68e21d26061..b674a0cf11d 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index f289b9cb514..5e3620cba87 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index a2e54d34770..bd3c0c7d780 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index dbeec277f88..1524eb7a77b 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index e3e5900fb74..75a4ce8fd06 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index 0669065b7d3..eafe6bd31e1 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index dcca0174817..6a06c0c70b5 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index 99cf1edd744..d4aa4b26d99 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index 415b44c6a35..b55d734674f 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index ba8b40b3c0a..22a5b9d5c52 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 40e131fefdf..5edbea4808d 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index bc11ca42c8f..5313952606a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index 8d4a4ecdcbf..c210f906b9b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index f43ab1e746a..29598bb4963 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index a52d3ed4a8b..cfaad1061df 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 4e9f0d1da0e..521d666742d 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index c9891219f4f..29af17f7c08 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 6b8f7176dee..917d6fc5cdf 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 399dd175311..87245438b4d 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index c06074d4709..373267c8921 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index 1e3f21d0eb7..b67427b9de8 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 08450aa204f..8f00ee95200 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index 9b0104ccfe5..edc76a392b0 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 0782e089170..302248ae299 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 68b6cd9a315..9c741080a27 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 177be65fb88..4dd0ae15ad4 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index d573c90eb18..ffc0666074d 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index e0b2c2494ad..96f122e59cd 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 92000240642..4beccac04b8 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 6240a2ed5c0..484cebf6a2a 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index e2c4be38a5f..a56201f7dba 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 51e133a86dc..84f6077e5ba 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index aab9c69c1a7..46685416239 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index dc9732c0719..1d41d1ab59e 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index 663adaffe60..d6dd854a240 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 73dc6489461..0b7d6a61f56 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index 0b42446740b..c1ee00edd07 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index 7d728850185..d694d696801 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index d062249c3b8..925ca9eee81 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f33c92ea7fe..f67337de388 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 92f21a35f28..8c8454fbc28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index e62275df23d..6c673570cfc 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 29ad3853f90..9c05ed97a8d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Ocbo +-- Copyright (C) 2005 Marc Barilley / Oc�bo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b9ba378d81f..b127b194fa5 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 8771b0ddda8..5c8ea94ed09 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 8bb011f7280..94ba92d4856 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 1aba5d286d1..4017ae32682 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index e0c4fd61701..2c77ae3447c 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 1e721e86788..52c0a3e2a03 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index d4ea3ad5535..439b2a68098 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index 6f8d6a8cf97..f01b7d02e8e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index 854ec6e826e..bd1e805aed2 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index f1e90520593..bfc2162ceca 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 15d3bda5ba2..784e3d37507 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 66a61851cae..029bc528b6e 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 195d2464738..9c066c54436 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index 44a301a2db7..f4e38524d25 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index 237b5c23030..f03d92ce651 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 3bec7551161..2c9c2d929db 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index 45845593162..d9e9ecd43a7 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 672374961d5..01cabfec865 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index d8d9443595d..696cf49c337 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index f21fed4d1af..170bd56f390 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index a501b4db4b6..5a3d71b489a 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index 41a91a9aa5f..d29449c2503 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index e12dbc6fb12..86f114d395b 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index 1a83bee6508..ce320558709 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 93a28593f8e..76f76ff08ed 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index ec2bb01863b..133687c7466 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 552a985abd4..6ccd3aa39fb 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index 63b28ac8410..e24a8918c5b 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index e7ccde53858..26e451271cb 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index a1619df5cb5..40b07d29305 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index 309c60b660f..e21669e63d7 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index c92472f7af5..d094512d975 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index 3fb70995900..a75fb9aa76d 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ +-- $Id: llx_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index e7fc66a0ed6..a0d88737e3f 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 57b252ed2ea..9e28a37d6bb 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index b8453ea821c..376447586c9 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index 00268974476..e7528a03f28 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 16bf4dea7f0..4f994cf57aa 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index eff6387abee..1a7fdfd755f 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index f53599483a4..a618e3d8790 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index b9643f019c3..902f2b4fd5f 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index db4cdd2581c..1f5500e2eb1 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index 6bf45f749f5..c7d84e27326 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 7db41de673c..523eb3b37e0 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index 8dc4636c87e..bf057b4ad75 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index d500fc1b7cb..ade6a40a80d 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index a515ba541bf..bca670bbb98 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index b742b82dafc..7481589df00 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index fff909a0ec8..4adaa1a56ff 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index fb65e9b7e84..16631c76b76 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 332b1305d38..3df14473a7e 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index ca4206eb6fc..c3958313ea3 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 68e1d4f20e9..910d2ab2072 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 8714e7e4a07..5c7f2e9a59c 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index 7d3b0eecd98..cbaadb10091 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index 8bdd7193d1a..e88665b5a34 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 367d45e8525..86916c216a2 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 28b28aeb762..23065b261c8 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ +-- $Id: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index d78db14c30b..3f58eaf698b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 68e46fd120d..18924ff6ac5 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 6acb2db4585..8056a150fc3 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 838f502bfdb..1b5ea5516d4 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index f21099e9c5e..e61985c7dd1 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index f771be5ef5a..7bf81b7fbe9 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 0033bca36bc..1fb0d708dfa 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 8037c9cd7e5..6df43634ec4 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 99234b6660f..7b6cbd91645 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index dca8e80f856..810781ed6d9 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index f3a58aa1433..2e89f083575 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index 98c56c37567..fd656c736ef 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 100d9fe82b0..87f6416c6c5 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ -- ============================================================================ CREATE LANGUAGE plpgsql; 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 deleted file mode 100644 index 38e0f007a15..00000000000 --- a/htdocs/langs/es_ES/html/gpl.html +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - -H. Licencia Pública GNU - - - - - - - - - - - - - -

          Licencia Pública GNU

          - - - - -
          - -GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 - -
          - -

          Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, - MA 02139, USA.

          -

          Está permitido, a cualquier persona, copiar y distribuir copias tal cual de - este documento de licencia, sin la introducción de cualquier cambio. -

          - -
          -

          Introducción

          -

          Las licencias de muchos softwares se desarrollan para asegurar la libertad - de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, - al contrario, pretende garantizar la libertad de compartir y alterar softwares - de libre distribución - volviéndolos de libre distribución también para cualquier - de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares - de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla - (algunos softwares de la FSF son cubiertos por la GNU Library General Public - License).

          -

          Cuando nos referimos a softwares de libre distribución, nos referimos a la - libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar - la libertad de distribución de copias de softwares de libre distribución (y - cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos - fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se - hacen algunas restricciones, para asegurar los derechos de los programadores, - prohibiendo a todas las personas su negación o la solicitación de su abdicación. - Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución - o modificación del software.

          -

          Por ejemplo, al distribuirse copias de determinado programa, por una tasa - determinada o gratuitamente, se debe informar sobre todos los derechos incidentes - sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia - Pública General GNU.

          -

          La protección de los derechos envuelve dos pasos: (1) copyright del software - y (2) licencia que da permiso legal para copia, distribución y/o modificación - del softwares.

          -

          Aún para la protección de la FSF y del autor es importante que todos entiendan - que no hay garantías para softwares de libre distribución. Si software se modifica - por alguien y lo pasa adelante, este software no más reflejará el trabajo original - del autor no pudiendo, por consiguiente, ser garantizado por aquél.

          -

          Finalmente, cualquier programa de libre distribución está constantemente amenazado - por las patentes de softwares. Buscamos evitar el peligro de que distribuidores - de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. - Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación - de patente se debe hacer permitiendo el uso por cualquier individuo, sin la - necesidad de licencia de uso.

          -

          Los términos y condiciones precisas para copia, distribución y modificación - siguen abajo:

          -
          -

          Licencia Pública General GNU

          -

          TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN -

          - -
            - -

          1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga - un aviso colocado por el detentor de los derechos de autor diciendo que aquel - podrá ser distribuido en las condiciones de la Licencia Pública General. El - Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado - en un Programa y significa tanto el propio Programa, como cualquier de los - trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, - un trabajo que contenga el Programa o una parte de este, en su forma original - o con modificaciones o traducido para una otra lengua (la traducción está - incluida sin limitaciones en el término ``modificación'').

            -

            Actividades distintas de copia, distribución y modificación no están cubiertas - por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa - no está restringido y la salida del Programa está cubierta solamente en - el caso de que su contenido contenga trabajos basados en el Programa (independientemente - de que hayan sido creados por la ejecución del Programa). Si esto es así, - depende de las funciones ejecutadas por el Programa.

            2. - -

          2. El código fuente del Programa, de la forma como fue recibido, puede ser - copiado y distribuido, en cualquier media, desde que sea providenciado un - aviso adecuado sobre los copyrights y la negación de garantías, y todos los - avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, - estén inalterados y que cualquier producto oriundo del Programa esté acompañado - de esta Licencia Pública General.

            -

            Está permitido el cobro de tasas por el acto físico de transferencia o - grabación de copias, y pueden ser dadas garantías y soporte en cambio del - cobro de valores.

            3. - - -
          3. -

            Se puede modificar la copia o copias del Programa de cualquier forma que - se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir - tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

            - -
              -

            1. Debe existir un aviso destacado de que los datos originales fueron alterados - en los archivos y las fechas de los cambios;

              2. - -

            2. Debe existir un aviso de que el trabajo distribuido o publicado es, - de forma total o parcial, derivado del Programa o de alguna parte suya, - y que puede ser licenciado totalmente sin costes para terceros bajo los - términos de esta Licencia.

              3. - -

            3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, - en el inicio de tu ejecución, presentar la información de copyright y - de ausencia de garantías (o de que la garantía es de responsabilidad de - terceros), y que los usuarios pueden redistribuir el programa bajo estas - condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

              4. -
            - - Estos requisitos se aplican a trabajos de modificación en general. Si - algunas secciones identificables no sean derivadas del Programa, y pueden - ser consideradas como partes independientes, entonces esta Licencia y sus - Términos no se aplican a aquellas secciones cuando distribuidas separadamente. - Pero al distribuir aquellas secciones como parte de un trabajo basado en - el Programa, la distribución, como un todo, debe contener los términos de - esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no - a cada una de las partes independientemente de quem los tenga desarrollado. - Más que tener intención de contestar los derechos sobre el trabajo desarrollado - por alguien, esta sección objetiva propiciar la correcta distribución de - trabajos derivados del Programa. - Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado - en él ni a un trabajo basado en él, a un volumen de almacenaje o media de - distribución no obliga la utilización de esta Licencia y de sus términos - al trabajo. -
            4. - - -
          4. -

            Están permitidas, la copia y la distribución, del Programa (o un trabajo - basado en éste) en la forma de código objeto o ejecutable de acuerdo con los - términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

            - -
              -

            1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos - en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada - para manejo de softwares o

              -
              2. -

            2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, - de poner a disposición a terceros, por un coste no superior al coste del - medio físico de almacenaje, una copia completa de los códigos fuente en - medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

              -
              3. -

            3. Esté acompañada con la misma información recibida en relación con la - oferta de la distribución del código fuente correspondiente (esta alternativa - solamente está permitida para distribuciones no comerciales y solamente - si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, - de acuerdo con la sección 2 arriba).

              -
              4. -
            - El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones - en aquel trabajo. Cuando se habla en códigos fuentes completos significa - hablar de todos los fuentes de todos los módulos, además de las definiciones - de interfaces asociadas, archivos, scripts utilizados en la compilación - y instalación del ejecutable. Como una excepción excepcional, el código - fuente distribuido podrá no incluir algunos componentes que no se encuentren - en su escopo, como compilador, kernel, etc... para el SO donde el trabajo - sea ejecutado. - Si la distribución del ejecutable o objeto se hace, a través de acceso - a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente - de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos - con los objetos simultáneamente -
            5. - -
          5. -

            No está permitida la copia, modificación, sublicenciamiento o distribución - del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier - tentativa de copia, modificación, sublicenciamiento o distribución del Programa - está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. - Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, - no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas - de esta Licencia.

            6. -
          6. -

            No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá - documento o contrato que garantice permiso de modificación o distribución - del Programa o sus trabajos derivados. Estas acciones están prohibidas por - ley, en el caso de que no se acepten las condiciones de esta Licencia. La - modificación o distribución del Programa, o cualquier trabajo basado en éste, - implica en la aceptación de esta Licencia y de todos los términos de ésta - para copia, distribución o modificación del Programa o trabajos basados en - éste.

            7. -
          7. -

            Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), - el recipiente automáticamente recibe una licencia del detentor original de - los derechos de copia, distribución o modificación del Programa objeto de - estos términos y condiciones. No pueden ser impuestas otras restricciones - en los recipientes.

            8. - -
          8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes - o derechos de autor, se impongan restricciones, que contradigan esta Licencia, - estos no exentan de su aplicación. Si no es posible distribuir el Programa - de forma a garantizar simultáneamente las obligaciones de esta Licencia y - otras que sean necesarias, entonces el Programa no podrá ser distribuido. -

            Si esta Sección se considera, inválida por cualquier motivo particular - o general, su resultado implicará en la invalidación general de esta licencia - en la copia, modificación, sublicenciamiento o distribución del Programa - o trabajos basados en éste.

            -

            El propósito de esta sección no es, de forma alguna, incitar a quien quiera - que sea a infringir derechos reclamados en cuestiones válidas y procedentes, - y si proteger las premisas del sistema de libre distribución de software. - Muchas personas tienen hecho contribuciones generosas al sistema, en la - forma de programas, y es necesario garantizar la consistencia y credibilidad - del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución - de los softwares.

            -

            Esta sección pretende hacer claro los motivos que crearan las demás cláusulas - de estas Licencia.

            9. - -
          9. -

            Si la distribución del Programa, dentro de los términos de esta Licencia, - tiene restricciones en algún País, por patentes o derechos de autor, el detentor - original de los derechos de autor del Programa bajo esta Licencia puede adicionar - explícitamente limitaciones geográficas de distribución, excluyendo aquellos - Países, haciendo con que la distribución solamente sea posible en los Países - no excluidos.

            10. - -
          10. -

            La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) - puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública - General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos - objetivos y el espirito de la presente versión, pudiendo variar en detalles - referentes a nuevas situaciones encontradas.

            -

            A cada versión se da un número distinto. Si el Programa especifica, un - número de versión determinado de esta Licencia, que tenga en su contenido - la expresión ``o versión más actualizada'', es posible optar por las condiciones - de aquella versión o de cualquier versión más actualizada publicada por - la FSF.

            11. - -
          11. -

            Si deseas incorporar parte del Programa en otros programas de libre distribución - de softwares hace falta autorización formal del autor. Para softwares que - la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde - que mantenido el espirito y objetivos originales de esta Licencia.

            12. -
          - -

          AUSENCIA DE GARANTÍAS

          -
            -

          1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER - GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE - EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS - DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, - LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD - Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS - CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y - REPAROS JUZGADOS NECESARIOS.

            2. -

          2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR - LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN - RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE - HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS - O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES - O DAÑOS.

            -

            FIN DE LA LICENCIA

          - - -
          -

           

          -

          Apéndice

          -

          ¿Cómo aplicar estos términos a nuevos softwares?

          -

          Si has desarrollado un nuevo programa y deseas su amplia distribución para - el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, - que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

          -

          Para esto basta con anexar este aviso al programa. Se recomienda indicar aún - en el inicio de cada archivo fuente la ausencia de garantías y una anotación - de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

          -

          <nombre del programa y función> Copyright (C) 199X <Autor> -

          -

          Este programa es un software de libre distribución, que puede ser copiado - y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo - con la publicada por la Free Software Foundation, versión 2 de la licencia o - (a criterio del autor) cualquier versión posterior.

          -

          Este programa se distribuye en la expectativa de ser útil a sus usuarios, - pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE - ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General - 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. -

          -

          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:

          -

          Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares - NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software - de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. - Teclea 'muestra condic' para mayores detalles.

          -

          Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las - partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos - pueden variar o pueden ser accionados por otras interfaces como clic de ratón, - etc...

          -

           

          -
          -
          - -www.conectiva.com - -
          - - - - - diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt deleted file mode 100644 index 3efbe1ccee7..00000000000 --- a/htdocs/langs/nl_BE/html/gpl.txt +++ /dev/null @@ -1,340 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -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 deleted file mode 100644 index 778e2b02b41..00000000000 --- a/htdocs/langs/nl_NL/html/gpl.txt +++ /dev/null @@ -1,339 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van -deze licentie. \ No newline at end of file diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index c2d47f668da..4092c55ff2d 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ /** * \file htdocs/lib/admin.lib.php * \brief Library of admin functions - * \version $Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis 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.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $ */ function security_prepare_head() { @@ -615,16 +615,41 @@ function Activate($value,$withdeps=1) // Activate module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } $objMod = new $modName($db); @@ -700,20 +725,46 @@ function UnActivate($value,$requiredby=1) $modName = $value; $ret=''; + $modulesdir=array(); // Desactivation du module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } if ($found) diff --git a/htdocs/lib/ajax.lib.php b/htdocs/lib/ajax.lib.php index 7db1908bc49..55def736688 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ */ diff --git a/htdocs/lib/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/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index 454073d9730..d6bf7267439 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index b5304ba4198..6e1e7b262f4 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index bda35165079..b0a7c2dece6 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id$ + * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ */ if (session_id() == "") session_start(); diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 1dfd99cc99e..ec5d660daef 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -25,7 +25,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.125 2011/07/31 23:22:57 eldy Exp $ + * \version $Id: soc.php,v 1.126 2011/08/01 00:38:49 eldy Exp $ */ require("../main.inc.php"); @@ -587,7 +587,8 @@ else if ($conf->fournisseur->enabled && (GETPOST("type")=='f' || GETPOST("type")=='')) { $object->fournisseur=1; } if (GETPOST("private")==1) { $object->particulier=1; } - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prenom=$_POST["prenom"]; $object->particulier=$_REQUEST["private"]; $object->prefix_comm=$_POST["prefix_comm"]; @@ -1093,7 +1094,8 @@ else if (! empty($_POST["nom"])) { // We overwrite with values if posted - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prefix_comm=$_POST["prefix_comm"]; $object->client=$_POST["client"]; $object->code_client=$_POST["code_client"]; @@ -1967,5 +1969,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.125 $'); +llxFooter('$Date: 2011/08/01 00:38:49 $ - $Revision: 1.126 $'); ?> \ No newline at end of file diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 78ca25e85a6..edb62d728d5 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $ + * \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/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/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index f93935ffb16..e78dff8f646 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id$ + * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php index 74a4705b691..6e14cbf8e12 100644 --- a/htdocs/theme/yellow/style.css.php +++ b/htdocs/theme/yellow/style.css.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/yellow/style.css.php * \brief Fichier de style CSS du theme Yellow - * \version $Id: style.css.php,v 1.45 2011/07/28 13:31:58 eldy Exp $ + * \version $Id: style.css.php,v 1.46 2011/07/31 23:22:04 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index e4e52c611b4..9edcafd59c0 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/group/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.39 2011/07/31 23:21:25 eldy Exp $ + * \version $Id: perms.php,v 1.40 2011/08/01 13:15:53 hregis Exp $ */ require("../../main.inc.php"); @@ -93,10 +93,34 @@ if ($_GET["id"]) // Charge les modules soumis a permissions $modules = array(); - foreach ($conf->file->dol_document_root as $dirroot) + $modulesdir = array(); + + foreach ($conf->file->dol_document_root as $type => $dirroot) + { + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } + + foreach ($modulesdir as $dir) { - $dir = $dirroot . "/includes/modules/"; - // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
          "; $handle=@opendir($dir); @@ -292,5 +316,5 @@ if ($_GET["id"]) $db->close(); -llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.39 $'); +llxFooter('$Date: 2011/08/01 13:15:53 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index adb7fa764b6..47710b31d9d 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.56 2011/07/31 23:19:42 eldy Exp $ + * \version $Id: perms.php,v 1.57 2011/08/01 13:15:54 hregis Exp $ */ require("../main.inc.php"); @@ -120,12 +120,34 @@ $db->begin(); // Search all modules with permission and reload permissions def. $modules = array(); +$modulesdir = array(); -$listdir=$conf->file->dol_document_root; -foreach($listdir as $dirroot) +foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir=$dirroot."/includes/modules/"; + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} +foreach($modulesdir as $dir) +{ $handle=opendir($dir); if (is_resource($handle)) { @@ -373,5 +395,5 @@ print '
          '; $db->close(); -llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.56 $'); +llxFooter('$Date: 2011/08/01 13:15:54 $ - $Revision: 1.57 $'); ?> diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index 143af8934c7..fb4b85a0aa9 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/viewimage.php * \brief Wrapper to show images into Dolibarr screens * \remarks Call to wrapper is '' - * \version $Id: viewimage.php,v 1.96 2011/07/28 13:56:17 eldy Exp $ + * \version $Id: viewimage.php,v 1.97 2011/07/31 23:19:04 eldy Exp $ */ // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). From de86dcf50f3739f253f507ee3288814fb2bbafa7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 30 Jul 2011 16:55:18 +0000 Subject: [PATCH 020/118] Work on 3.1 packaging --- build/deb/changelog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build/deb/changelog b/build/deb/changelog index 420975c16ec..b035f18ae1d 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -1,8 +1,9 @@ -dolibarr (3.1.0) unstable; urgency=low +dolibarr (3.1.0-1.1) unstable; urgency=low + * Non-maintainer upload * 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 From 990fd77067304a1dba543f5ae0dacbf297a35c59 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 11:56:43 +0000 Subject: [PATCH 021/118] Work on 3.1 packaging --- htdocs/install/etape5.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 5e826a0f9f7..0c1c03cfdd9 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -24,7 +24,7 @@ * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.104 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape5.php,v 1.105 2011/07/31 11:56:43 eldy Exp $ */ include_once("./inc.php"); @@ -315,7 +315,6 @@ if ($action == "set") if (! empty($force_install_lockinstall)) { // Install is finished, we create the lock file - $lockfile="../../install.lock"; $fp = @fopen($lockfile, "w"); if ($fp) { From 1c88de7e97b8f001d9657b04c47763e93a42bf3d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 12:31:00 +0000 Subject: [PATCH 022/118] Fix: Duplicate entries --- htdocs/install/mysql/data/llx_10_c_regions.sql | 5 +++-- htdocs/install/mysql/data/llx_20_c_departements.sql | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 8ea28cbbcc3..1f046a29bc4 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -18,9 +18,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_10_c_regions.sql,v 1.14 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 4be9b6b7719..9a109ab3fdc 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -18,9 +18,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_20_c_departements.sql,v 1.16 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ -- -- From faffaf5014c4afd221b057bf2abcf6004fd98f3a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 13:17:03 +0000 Subject: [PATCH 023/118] Work on 3.1 packaging --- build/makepack-dolibarr.pl | 8 +- build/rpm/dolibarr.spec | 185 ++++++++++++--------------- build/rpm/install.forced.php.install | 4 +- 3 files changed, 88 insertions(+), 109 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index a791fd3f828..2b5e9ba380b 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.123 2011/07/30 14:56:12 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.124 2011/07/31 13:17:03 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.123 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.124 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -696,12 +696,12 @@ 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/"`; } else { print "Move *_all.deb to $DESTI\n"; - $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; + $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; } next; } diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index e6996caa4b3..090b8e3547d 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -5,11 +5,6 @@ # file to build a package for your own distributions and # edit it if you need to match your rules. # -------------------------------------------------------- - -#%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0) -#%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) -#%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0) - %define name dolibarr %define version __VERSION__ %define release __RELEASE__ @@ -17,18 +12,15 @@ Name: %{name} Version: %{version} Release: %{release} -Summary: ERP and CRM software for small and medium companies or foundations -Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos -Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations -Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti +Summary: Dolibarr -License: GPLv2+ +License: GPL Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz -BuildArch: noarch +#BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif @@ -56,7 +48,7 @@ AutoReqProv: no %description -An easy to use CRM & ERP open source/free software for small +Dolibarr ERP & CRM is an easy to use open source/free software for small and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. @@ -64,26 +56,27 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Un software ERP y CRM para pequeñas y medianas empresas, asociaciones -o autónomos. Incluye diferentes funcionalidades para la Planificación -de Recursos Empresariales (ERP) y Gestión de la Relación con los -Clientes (CRM) así como para para otras diferentes actividades. -Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades -que necesita y haciendo hincapié en su facilidad de uso. +Dolibarr ERP y CRM es un software open source/gratis para pequeñas y +medianas empresas, asociaciones o autónomos. Incluye diferentes +funcionalidades para la Planificación de Recursos Empresariales (ERP) y +Gestión de la Relación con los Clientes (CRM) así como para para otras +diferentes actividades. Dolibarr ha sido diseñado para suministrarle +solamente las funcionalidades que necesita y haciendo hincapié en su +facilidad de uso. %description -l fr -Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, +Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, artisans ou associations. Il permet de gérer vos clients, prospect, fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Un programmo gestionale per piccole e medie +Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori -attività. Progettato per poter fornire solo ciò di cui hai bisogno +attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. -Programmo web, progettato per poter fornire solo ciò di +Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. @@ -101,51 +94,48 @@ echo Building %{name}-%{version}-%{release} #---- install %install -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr -%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf -%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr +mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build +mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc +mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs +mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts -# %{_datadir} = /usr/share -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -%{__install} -m 644 var/www/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications -%{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts -%{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr -%{__cp} -pr var/www/dolibarr/doc $RPM_BUILD_ROOT/var/www/dolibarr -%{__cp} -pr var/www/dolibarr/htdocs $RPM_BUILD_ROOT/var/www/dolibarr -%{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr -%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr #---- clean %clean -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT #---- files %files - %defattr(-,root,root) +%doc README +%doc COPYRIGHT %doc /var/www/dolibarr/doc/* %dir /var/www/dolibarr/build %dir /var/www/dolibarr/htdocs %dir /var/www/dolibarr/scripts -%_datadir/pixmaps/dolibarr.png +%_datadir/pixmaps/* %_datadir/applications/%{name}.desktop /var/www/dolibarr/build/* /var/www/dolibarr/htdocs/* /var/www/dolibarr/scripts/* - -%defattr(0664, -, -, 0755) -%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf -%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr +/var/www/dolibarr/README +/var/www/dolibarr/COPYRIGHT +#%config /var/www/dolibarr/htdocs/conf/conf.php #---- post (after unzip during install) @@ -163,11 +153,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" -export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" -#export config="/usr/share/dolibarr/htdocs/conf/conf.php" -export config="%{_sysconfdir}/dolibarr/conf.php" -export lockfile="/usr/share/dolibarr/install.lock" +#config="/usr/share/dolibarr/htdocs/conf/conf.php" +config="%{_sysconfdir}/dolibarr/conf.php" +lockfile="/usr/share/dolibarr/install.lock" # Detect OS @@ -201,8 +189,8 @@ echo OS detected: $os # Create empty directory for uploaded files and generated documents echo Create document directory $docdir -%{__mkdir} -p $docdir -%{__mkdir} -p %{_sysconfdir}/dolibarr +mkdir -p $docdir +mkdir -p %{_sysconfdir}/dolibarr # Create install.forced.php into Dolibarr install directory superuserlogin='' @@ -214,42 +202,31 @@ 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 ] then echo Create empty file $config touch $config - %{__chown} -R root:$apachegroup $config - %{__chmod} -R 660 $config + chown -R root:$apachegroup $config + chmod -R 660 $config fi -# Create config file for apache $apacheconfig -#if [ ! -f $apacheconfig ]; then -# echo Create dolibarr web server config file $apacheconfig -# cp $apachefileorig $apacheconfig -# chmod a-x $apacheconfig -# chmod go-w $apacheconfig -#fi - -# Create config file for se $seconfig -if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then - echo Add SE Linux permission from file $sefileorig - semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" - semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" - semanage fcontext -a -t httpd_sys_script_rw_t "/var/www/dolibarr/install.lock" - restorecon -R -v /etc/dolibarr - restorecon -R -v /usr/share/dolibarr - restorecon -v /var/www/dolibarr/install.lock +# Create a config file $apacheconfig +if [ ! -f $apacheconfig ]; then + echo Create dolibarr web server config file $apacheconfig + cp $apachefileorig $apacheconfig + chmod a-x $apacheconfig + chmod go-w $apacheconfig fi -# Create a config link dolibarr.conf +# Create a config link dolibarr.conf for Fedora or Redhat if [ ! -f $apachelink ]; then echo Create dolibarr web server config link $apachelink ln -fs $apacheconfig $apachelink @@ -257,13 +234,25 @@ fi # Set permissions echo Set permission to $apacheuser:$apachegroup on $targetdir -%{__chown} -R $apacheuser:$apachegroup $targetdir -%{__chmod} -R a-w $targetdir -%{__chmod} u+w $targetdir +chown -R $apacheuser:$apachegroup $targetdir +chmod -R a-w $targetdir +chmod u+w $targetdir echo Set permission to $apacheuser:$apachegroup on $docdir -%{__chown} -R $apacheuser:$apachegroup $docdir -%{__chmod} -R o-w $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 @@ -274,12 +263,6 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then %{_sysconfdir}/init.d/apache2 restart fi -# Restart mysql -echo Restart mysql -if [ -f /etc/init.d/mysqld ]; then - /etc/init.d/mysqld restart -fi - # Show result echo echo "----- Dolibarr %version - (c) Dolibarr dev team -----" @@ -307,9 +290,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#export config="/usr/share/dolibarr/htdocs/conf/conf.php" -export config="%{_sysconfdir}/dolibarr/conf.php" -export lockfile="$targetdir/install.lock" +#config="/usr/share/dolibarr/htdocs/conf/conf.php" +config="%{_sysconfdir}/dolibarr/conf.php" +lockfile="$targetdir/install.lock" # Detect OS @@ -344,7 +327,7 @@ echo OS detected: $os if [ -f $apachelink ] ; then echo Delete apache config link for Dolibarr - %{__rm} -f $apachelink + rm -f $apachelink status=purge fi @@ -362,16 +345,12 @@ then fi # Removed dirs after apache restart -echo Removed remaining $config -%{__rm} -f $config -echo Removed remaining $installconfig -%{__rm} -f $installconfig -echo Removed remaining $lockfile -%{__rm} -f $lockfile -echo Removed remaining dir $targetdir/doc +echo Removed remaining dirs +rm -f $apacheconfig +rm -f $config +rm -f $installconfig +rm -f $lockfile rmdir $targetdir/doc >/dev/null 2>&1 - +rmdir $targetdir/htdocs >/dev/null 2>&1 %changelog -* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 -- Initial version (#723326) diff --git a/build/rpm/install.forced.php.install b/build/rpm/install.forced.php.install index 5f390270b51..fafdc2df676 100755 --- a/build/rpm/install.forced.php.install +++ b/build/rpm/install.forced.php.install @@ -4,9 +4,9 @@ $force_install_message='KeepDefaultValuesDeb'; $force_install_main_data_root='/usr/share/dolibarr/documents'; $force_install_type='mysqli'; $force_install_port='3306'; -$force_install_database='dolibarr'; +$force_install_database='dolibarrrpm'; $force_install_createdatabase='1'; -$force_install_databaselogin='dolibarrmysql'; +$force_install_databaselogin='dolibarrrpm'; $force_install_databasepass=''; $force_install_createuser='1'; $force_install_databaserootlogin='__SUPERUSERLOGIN__'; From 1b209014dc663bb191cc72a5637a43ec00f21770 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 13:25:52 +0000 Subject: [PATCH 024/118] Work on 3.1 packaging --- build/deb/postrm | 51 +++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/build/deb/postrm b/build/deb/postrm index 95f27de27dd..9eae81b022b 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -30,6 +30,7 @@ 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="" @@ -43,6 +44,32 @@ esac 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 apacheconfig=$apacheconfig" @@ -198,30 +225,6 @@ case "$1" in #db_purge ;; - # Call when we uninstall - remove) - rm -f /usr/share/dolibarr/install.lock - - # 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 - ;; - - upgrade) - ;; - failed-upgrade|abort-install|abort-upgrade|disappear) ;; From 4f500cf3adb2d4349d583dae17ef4bb09bccb441 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 13:28:45 +0000 Subject: [PATCH 025/118] Work on 3.1 packaging --- build/rpm/install.forced.php.install | 1 + htdocs/install/etape5.php | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/rpm/install.forced.php.install b/build/rpm/install.forced.php.install index fafdc2df676..f01e5303ce0 100755 --- a/build/rpm/install.forced.php.install +++ b/build/rpm/install.forced.php.install @@ -3,6 +3,7 @@ $force_install_noedit=2; $force_install_message='KeepDefaultValuesDeb'; $force_install_main_data_root='/usr/share/dolibarr/documents'; $force_install_type='mysqli'; +$force_install_dbserver='localhost'; $force_install_port='3306'; $force_install_database='dolibarrrpm'; $force_install_createdatabase='1'; diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 0c1c03cfdd9..0037190af06 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -24,7 +24,7 @@ * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.105 2011/07/31 11:56:43 eldy Exp $ + * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ */ include_once("./inc.php"); @@ -364,7 +364,6 @@ elseif (preg_match('/upgrade/i',$action)) if (! empty($force_install_lockinstall)) { // Upgrade is finished, we create the lock file - $lockfile="../../install.lock"; $fp = @fopen($lockfile, "w"); if ($fp) { From ab822a6ea7a560b8d76bb8659b1334ee7b7f2cb2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 15:31:32 +0000 Subject: [PATCH 026/118] Work on 3.1 packaging --- build/deb/README | 5 ++--- build/makepack-dolibarr.pl | 8 ++++++-- build/rpm/README | 31 +++++++++---------------------- 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/build/deb/README b/build/deb/README index d73d7a99219..edb46ffd5a3 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,13 +22,12 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build binary only package +# dpkg -b To build package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# dpkg-reconfigure -plow package Reconfigure package +# # dpkg -L packagename List content of installed package -# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 2b5e9ba380b..32db31561bc 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.124 2011/07/31 13:17:03 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.125 2011/07/31 15:31:32 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.124 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.125 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -274,6 +274,10 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mssql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`; diff --git a/build/rpm/README b/build/rpm/README index f20bf91db72..f65f12cbb35 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -5,24 +5,15 @@ RPM Package tools This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, -with format RPM (for Redhat, OpenSuse, Mandriva, ...). +with format RPM (for Redhat, Mandriva, ...). -# This is standard command to work on RPM packaging: -# -# yum -y install rpmlint -# yum -y install hunspell-en hunspell-es hunspell-fr hunspell-it -# -# rpmlint file.rpm Test a package -# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm +# This is standard command to work on Debian packaging: # # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies -# yum erase dolibarr To remove package -# chcon -R -h -t httpd_sys_script_rw_t /file To add temporary context rw for httpd on /file -# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" To add persistent context rw for httpd on /dir (this add file_contexts.local) -# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage) +# yum erase dolibarr To remove package # # On OpenSuse # yast --install dolibarr-...rpm To install package and dependencies @@ -36,22 +27,18 @@ with format RPM (for Redhat, OpenSuse, Mandriva, ...). To submit a package to Fedora: -- Create account on bugzilla.redhat.com -- Create account on fedoraproject.org -- Create SRPMS package. -- Upload package onf http://fedorapeople.org + - Create a bug with form https://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&format=fedora-review This is example of content of review field (used for Bug 723326): -SRPMS URL: http://www.dolibarr.org/files/fedora/dolibarr-x.y.z-xxx.src.rpm +Spec URL: http://www.dolibarr.org/files/fedora/dolibarr.spec +SRPM URL: http://www.dolibarr.org/files/fedora/dolibarr-3.1.0-0.src.rpm Description: Dolibarr ERP & CRM is an easy to use open source/free software for small and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. I am author of other already packaged OpenSources packages (awstats) but this is my first package to maintain myself. So i'm seeking a sponsor. + - Edit field "Block" and add FE-NEEDSPONSOR -- Check bug is into database by searching with id on https://bugzilla.redhat.com/ -- Install fedora packager tools: yum install fedora-packager -- Setup fedora packagers tools: fedora-packager-setup -- Send your package: koji build --scratch f16 path_to_source_RPM -- Check if package is available: http://koji.fedoraproject.org/koji/ \ No newline at end of file + +- Check bug is into database by searching with id on https://bugzilla.redhat.com/ \ No newline at end of file From 692c44847b3009d71cd79c6dbecb723a5f69ff13 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 16:13:04 +0000 Subject: [PATCH 027/118] Work on 3.1 packaging --- build/.cvsignore | 1 - 1 file changed, 1 deletion(-) diff --git a/build/.cvsignore b/build/.cvsignore index 53dd6ee2abd..a0dfb0ff8cd 100644 --- a/build/.cvsignore +++ b/build/.cvsignore @@ -16,4 +16,3 @@ html *.deb *.dsc *.tar.gz -*.changes From 3219a88170b21c4ac1b6f83583a4c07836064b91 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 16:34:58 +0000 Subject: [PATCH 028/118] Work on 3.1 packaging --- build/rpm/dolibarr.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 090b8e3547d..c3c6d731cfb 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -20,7 +20,7 @@ Vendor: Dolibarr dev team URL: http://www.%{name}.org Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz -#BuildArch: noarch +BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif @@ -345,12 +345,17 @@ then fi # Removed dirs after apache restart -echo Removed remaining dirs +echo Removed remaining $apacheconfig rm -f $apacheconfig +echo Removed remaining $config rm -f $config +echo Removed remaining $installconfig rm -f $installconfig +echo Removed remaining $lockfile rm -f $lockfile +echo Removed remaining dir $targetdir/doc rmdir $targetdir/doc >/dev/null 2>&1 +echo Removed remaining dir $targetdir/htdocs rmdir $targetdir/htdocs >/dev/null 2>&1 %changelog From 0912d86c13b93104d38aa3750d4fff7b6e206392 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 17:14:02 +0000 Subject: [PATCH 029/118] Work on 3.1 packaging --- build/makepack-dolibarr.pl | 19 ++++++++++++++----- build/rpm/dolibarr.spec | 6 ++++-- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 32db31561bc..56d57a6df66 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.125 2011/07/31 15:31:32 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.126 2011/07/31 17:14:03 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.125 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.126 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -414,7 +414,8 @@ 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 @@ -439,6 +440,7 @@ if ($nboftargetok) { print "Remove other files\n"; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/README`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; @@ -476,6 +478,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; } @@ -679,7 +685,7 @@ if ($nboftargetok) { $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 "$SOURCE/build/deb/po/CVS"`; + $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"`; @@ -701,11 +707,14 @@ if ($nboftargetok) { { print "Move *_all.deb to $DESTI\n"; $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; + $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; + $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; } else { print "Move *_all.deb to $DESTI\n"; - $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; + $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; + $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; } next; } diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index c3c6d731cfb..1754220c6c7 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -355,7 +355,9 @@ echo Removed remaining $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 +#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 +- Initial upstream (#723326) From 3cccbcb9c2d795ce4abf32b2fda6608ca477949f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 18:06:36 +0000 Subject: [PATCH 030/118] Work on 3.1 packaging --- build/.cvsignore | 1 + build/makepack-dolibarr.pl | 21 ++++++++++++++------- build/rpm/README | 8 +++++--- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/build/.cvsignore b/build/.cvsignore index a0dfb0ff8cd..53dd6ee2abd 100644 --- a/build/.cvsignore +++ b/build/.cvsignore @@ -16,3 +16,4 @@ html *.deb *.dsc *.tar.gz +*.changes diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 56d57a6df66..ae04a704e10 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.126 2011/07/31 17:14:03 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.127 2011/07/31 18:06:36 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.126 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.127 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -418,11 +418,15 @@ if ($nboftargetok) { $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"; @@ -709,12 +713,15 @@ if ($nboftargetok) { $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; + $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; } else { print "Move *_all.deb to $DESTI\n"; + $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; + $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; } next; } diff --git a/build/rpm/README b/build/rpm/README index f65f12cbb35..c157a195c03 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -27,11 +27,13 @@ with format RPM (for Redhat, Mandriva, ...). To submit a package to Fedora: - +- Create account on bugzilla.redhat.com +- Create account on fedoraproject.org +- Create SRPMS package. +- Upload package onf http://fedorapeople.org - Create a bug with form https://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&format=fedora-review This is example of content of review field (used for Bug 723326): -Spec URL: http://www.dolibarr.org/files/fedora/dolibarr.spec -SRPM URL: http://www.dolibarr.org/files/fedora/dolibarr-3.1.0-0.src.rpm +SRPMS URL: http://www.dolibarr.org/files/fedora/dolibarr-x.y.z-xxx.src.rpm Description: Dolibarr ERP & CRM is an easy to use open source/free software for small and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer From d420c75ec2ac94d34d3ba8465d5babbae43f7484 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Aug 2011 18:22:25 +0000 Subject: [PATCH 031/118] Work on debian package --- build/deb/README | 5 +- build/deb/config | 45 +++++------ build/deb/postinst | 108 ++++++++++++++++----------- build/deb/postrm | 117 ++++++++++++++--------------- build/makepack-dolibarr.pl | 148 ++++++++++++++++++++++++++++--------- 5 files changed, 259 insertions(+), 164 deletions(-) diff --git a/build/deb/README b/build/deb/README index edb46ffd5a3..d73d7a99219 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build package +# dpkg -b To build binary only package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# +# dpkg-reconfigure -plow package Reconfigure package # dpkg -L packagename List content of installed package +# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/config b/build/deb/config index 553e5ffd7f6..fd5ea96491b 100644 --- a/build/deb/config +++ b/build/deb/config @@ -13,29 +13,25 @@ db_version 2.0 echo Run the dolibarr config script # Rotate old configuration -#if [ "$1" = "reconfigure" ] ; then -# config="/etc/dolibarr/apache.conf" -# if [ -f $config ] ; then -# for i in $(seq 8 -1 0) ; do -# if [ -f ${config}.$i ] ; then -# mv ${config}.$i ${config}.$(($i +1)) -# fi -# done -# mv ${config} ${config}.0 -# fi -#fi +if [ "$1" = "reconfigure" ] ; then + config="/etc/dolibarr/apache.conf" + for i in $(seq 8 -1 0) ; do + if [ -f ${config}.$i ] ; then + mv ${config}.$i ${config}.$(($i +1)) + fi + done + mv ${config} ${config}.0 +fi # Rotate old configuration -#if [ "$1" = "reconfigure" ] ; then -# config="/etc/dolibarr/lighttpd.conf" -# if [ -f $config ] ; then -# for i in $(seq 8 -1 0) ; do -# if [ -f ${config}.$i ] ; then -# mv ${config}.$i ${config}.$(($i +1)) -# fi -# done -# mv ${config} ${config}.0 -# fi -#fi +if [ "$1" = "reconfigure" ] ; then + config="/etc/dolibarr/lighttpd.conf" + for i in $(seq 8 -1 0) ; do + if [ -f ${config}.$i ] ; then + mv ${config}.$i ${config}.$(($i +1)) + fi + done + mv ${config} ${config}.0 +fi db_capb backup @@ -43,9 +39,8 @@ db_capb backup db_title "dolibarr" || true -# Ask if we must delete database -echo "Ask for web server to setup" -db_input critical dolibarr/reconfigure-webserver || true +# Ask for web server type. +#db_input critical "dolibarr/webserver" || true if db_go ; then okcancel="1" diff --git a/build/deb/postinst b/build/deb/postinst index ca5fd1645dd..9f103d8876d 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,7 +1,5 @@ #!/bin/sh # postinst script for dolibarr -# -# see: dh_installdeb(1) set -e @@ -16,6 +14,31 @@ set -e # for details, see /usr/share/doc/packaging-manual/ + + +lighttpd_install() { + if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + if which lighty-enable-mod >/dev/null 2>&1 ; then + echo "Add link for Lighttpd config file" + ln -s /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf + # We enabled it + lighty-enable-mod dolibarr fastcgi-php + else + echo "Lighttpd not installed, skipping" + fi + fi +} + +apache_install() { + webserver=$1 + if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Add link for Apache config file" + ln -s /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + . /usr/share/debconf/confmodule db_version 2.0 @@ -27,8 +50,6 @@ 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" @@ -44,10 +65,6 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir - # Copy apache.conf file into target directory - #mkdir -p /etc/dolibarr - #cp -p $apachefileorig $apacheconfig - # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -74,21 +91,23 @@ case "$1" in chmod -R 660 $config fi - # Get the web server type (use db_get for interactive mode). - #db_reset "dolibarr/webserver" - #db_get "dolibarr/webserver" # Read value for webserver. - #webserver="$RET" - - case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; - esac - + + # Reconfigure web server + db_reset dolibarr/reconfigure-webserver + + # Ask if we must delete database + echo "Ask for web server to setup" + db_input critical dolibarr/reconfigure-webserver || true + db_go || true + + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + # Set up web server. - for server in $webservers ; do - echo Complete config of server $server + for webserver in $webservers ; do + webserver=${webserver%,} + echo Complete config of server $webserver # Detect webuser and webgroup webuser= @@ -106,26 +125,31 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config - - # Add link to config file - echo Setup web server $server to add dolibarr config file - ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf - done - # Restart servers - servers="apache2-ssl apache2 mysql" - # Another way to restart - for server in $servers ; do - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $server reload || true - else - echo Restart web server $server using $server reload - /etc/init.d/$server reload || true - fi + # Restart web server. + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_install + else + apache_install $webserver + fi + # Reload webserver in any case, configuration might have changed + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $webserver reload 3>/dev/null || true + else + echo Restart web server $server using $server reload + /etc/init.d/$webserver reload 3>/dev/null || true + fi + fi done + echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -136,13 +160,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument $1" >&2 exit 0 ;; esac -db_stop - #DEBHELPER# +db_stop + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 9eae81b022b..dd05ee90379 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,7 +17,36 @@ set -e # for details, see /usr/share/doc/packaging-manual/ -. /usr/share/debconf/confmodule + +lighttpd_remove() { + if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + echo "Remove link for Lighttpd config file" + rm -f /etc/lighttpd/conf-available/50-dolibarr.conf + if which lighty-enable-mod >/dev/null 2>&1 ; then + lighty-disable-mod dolibarr + else + echo "Lighttpd not installed, skipping" + fi + # See bug #448682 + if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then + echo 'Manually deleting lighttpd/dolibarr configuration link' + rm /etc/lighttpd/conf-enabled/50-dolibarr.conf + fi + fi +} + +apache_remove() { + if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Remove link for Apache config file" + rm -f /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi db_version 2.0 @@ -26,22 +55,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="" -# Allows us to loop and substitute in one pass -case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; -esac - case "$1" in @@ -53,36 +71,44 @@ case "$1" in 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" + # Reconfigure web server + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + + # Restart web servers + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_remove + else + apache_remove $webserver + fi + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload 3>/dev/null || true + else + /etc/init.d/$webserver reload 3>/dev/null || true + fi fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" + echo "postrm purge webservers=$webservers" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical "dolibarr/postrm" || true + db_input critical dolibarr/postrm || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get "dolibarr/postrm" + db_get dolibarr/postrm set -e if [ "$RET" = "true" ] ; then @@ -185,41 +211,12 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi - # Remove include files - export restart="" - for server in $webservers ; do - export conffile="/etc/$server/conf.d/dolibarr.conf" - if [ -f $conffile ] ; - then - echo Delete file $conffile - rm -f $conffile - status=purge - fi - - if [ "x$status" = "xpurge" ] ; - then restart="$restart $server" - fi - done - rm -rf /etc/dolibarr - # Restart servers - for server in $restart ; do - # We disable blocking errors - set +e - echo "Restart server $server if exists" - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $server reload || true - else - /etc/init.d/$server reload || true - fi - # We restore blocking errors - set -e - done - # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset "dolibarr/postrm" + db_reset dolibarr/reconfigure-webserver + db_reset dolibarr/postrm set -e #db_purge @@ -229,7 +226,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "postrm called with unknown argument $1" >&2 exit 0 ;; esac diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index ae04a704e10..20c5ba415e9 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.127 2011/07/31 18:06:36 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.129 2011/08/01 18:22:26 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.127 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -254,9 +254,11 @@ 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`; @@ -316,6 +318,9 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; } # Build package for each target @@ -444,17 +449,93 @@ if ($nboftargetok) { print "Remove other files\n"; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/README`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + # To remove once stable + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + + # Apache conf files + #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + + # Dolibarr conf files + # TODO + + # dolibarr.desktop + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; + #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; + #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; + + # pixmap + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; + #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; + #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; + + # Set owners + print "Set owners on files/dir\n"; + $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; + + print "Set permissions on files/dir\n"; + $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; + $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + + # Build tgz print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n"; $ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; @@ -491,6 +572,8 @@ if ($nboftargetok) { if ($target eq 'DEB') { + $olddir=getcwd(); + $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -593,19 +676,22 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache conf files + # Apache and lighttpd conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - - # Dolibarr conf files - # TODO + print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -622,17 +708,7 @@ if ($nboftargetok) { print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`; - #print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n"; - #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`; - - # copyright (to build binary package directly without sources. Useless if we build from sources) - #print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n"; - #$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`; - - # changelog (to build binary package directly without sources. Useless if we build from sources) - #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`; - #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`; - + # Set owners print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`; @@ -661,17 +737,15 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - print "Go to directory $BUILDROOT\n"; - $olddir=getcwd(); - chdir("$BUILDROOT"); - - # Creation of binary package (to build without sources) + # Creation of binary package (to build without sources) + #print "Go to directory $BUILDROOT\n"; + #chdir("$BUILDROOT"); #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Creation of source package + # Prepare source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -683,6 +757,7 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; + $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -698,6 +773,9 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; + + # Creation of source package + print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; From 5f8958e90319b5f55ce44a1b7fb9ac0941460547 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Aug 2011 18:58:37 +0000 Subject: [PATCH 032/118] Work on debian package --- build/deb/changelog | 2 +- build/deb/config | 45 +++++++++++++++++++++++++-------------------- build/deb/postinst | 12 ++---------- build/deb/postrm | 4 +++- 4 files changed, 31 insertions(+), 32 deletions(-) diff --git a/build/deb/changelog b/build/deb/changelog index b035f18ae1d..3382966714b 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 + -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/config b/build/deb/config index fd5ea96491b..553e5ffd7f6 100644 --- a/build/deb/config +++ b/build/deb/config @@ -13,25 +13,29 @@ db_version 2.0 echo Run the dolibarr config script # Rotate old configuration -if [ "$1" = "reconfigure" ] ; then - config="/etc/dolibarr/apache.conf" - for i in $(seq 8 -1 0) ; do - if [ -f ${config}.$i ] ; then - mv ${config}.$i ${config}.$(($i +1)) - fi - done - mv ${config} ${config}.0 -fi +#if [ "$1" = "reconfigure" ] ; then +# config="/etc/dolibarr/apache.conf" +# if [ -f $config ] ; then +# for i in $(seq 8 -1 0) ; do +# if [ -f ${config}.$i ] ; then +# mv ${config}.$i ${config}.$(($i +1)) +# fi +# done +# mv ${config} ${config}.0 +# fi +#fi # Rotate old configuration -if [ "$1" = "reconfigure" ] ; then - config="/etc/dolibarr/lighttpd.conf" - for i in $(seq 8 -1 0) ; do - if [ -f ${config}.$i ] ; then - mv ${config}.$i ${config}.$(($i +1)) - fi - done - mv ${config} ${config}.0 -fi +#if [ "$1" = "reconfigure" ] ; then +# config="/etc/dolibarr/lighttpd.conf" +# if [ -f $config ] ; then +# for i in $(seq 8 -1 0) ; do +# if [ -f ${config}.$i ] ; then +# mv ${config}.$i ${config}.$(($i +1)) +# fi +# done +# mv ${config} ${config}.0 +# fi +#fi db_capb backup @@ -39,8 +43,9 @@ db_capb backup db_title "dolibarr" || true -# Ask for web server type. -#db_input critical "dolibarr/webserver" || true +# Ask if we must delete database +echo "Ask for web server to setup" +db_input critical dolibarr/reconfigure-webserver || true if db_go ; then okcancel="1" diff --git a/build/deb/postinst b/build/deb/postinst index 9f103d8876d..e0bba1be4da 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -20,7 +20,7 @@ lighttpd_install() { if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then if which lighty-enable-mod >/dev/null 2>&1 ; then echo "Add link for Lighttpd config file" - ln -s /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf + ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf # We enabled it lighty-enable-mod dolibarr fastcgi-php else @@ -33,7 +33,7 @@ apache_install() { webserver=$1 if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then echo "Add link for Apache config file" - ln -s /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf + ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf fi } @@ -92,14 +92,6 @@ case "$1" in fi - # Reconfigure web server - db_reset dolibarr/reconfigure-webserver - - # Ask if we must delete database - echo "Ask for web server to setup" - db_input critical dolibarr/reconfigure-webserver || true - db_go || true - db_get dolibarr/reconfigure-webserver webservers="$RET" diff --git a/build/deb/postrm b/build/deb/postrm index dd05ee90379..27ce3777b7e 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -65,10 +65,12 @@ case "$1" in # Call when we upgrade upgrade) + echo "postrm upgrade" ;; # Call when we uninstall remove) + echo "postrm remove" rm -f $lockfile # Reconfigure web server @@ -98,7 +100,7 @@ case "$1" in # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers" + echo "postrm purge" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" From 5dbf674198981ccf12f65ccf587795eae67ca5f0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Aug 2011 19:10:27 +0000 Subject: [PATCH 033/118] Work on debian package From 461d3e2f2a83371ae6dcc19edfb0c9d72e5e5c57 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Aug 2011 22:03:50 +0000 Subject: [PATCH 034/118] Fix: Restore feature to have code inside language list From 4b3a4b7b4d8eaa27644ade05e107a3f2e5a809a0 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 2 Aug 2011 09:31:06 +0000 Subject: [PATCH 035/118] Trad: More accurate trad From d2161ee630873854cb0599f8dcdf9cad04b4385f Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 2 Aug 2011 12:44:20 +0000 Subject: [PATCH 036/118] bug #33926: Don't can edit contract lines From a509b42c8368ac40b60ef12c8b066ae4c9d4a8ff Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 2 Aug 2011 21:53:58 +0000 Subject: [PATCH 037/118] Fix: Avoid errors into rpm packages From 139b6857278edd7344c9a12a931ecaa7a4c9743c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 23:19:04 +0000 Subject: [PATCH 038/118] Fix: Avoid errors into rpm packages --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/control.DEBIAN | 46 + build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 - build/deb/install | 1 - build/deb/po/fr.po | 22 +- build/deb/po/templates.pot | 20 +- build/deb/postinst | 100 +- build/deb/postrm | 119 +- build/deb/templates | 7 - build/makepack-dolibarr.pl | 36 +- build/rpm/README | 10 +- build/rpm/dolibarr.desktop | 3 +- build/rpm/dolibarr.spec | 27 +- build/rpm/file_contexts.dolibarr | 6 +- dev/skeletons/modMyModule.class.php | 4 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 33 +- htdocs/admin/perms.php | 32 +- htdocs/admin/proxy.php | 7 +- htdocs/admin/security_other.php | 7 +- htdocs/admin/system/constall.php | 5 +- htdocs/boxes.php | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/tpl/validation1.tpl.php | 21 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/compta/prelevement/create.php | 7 +- htdocs/core/class/html.form.class.php | 11 +- htdocs/core/class/interfaces.class.php | 5 +- htdocs/filefunc.inc.php | 7 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 +++++++++-------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/index.php | 7 +- htdocs/install/default.css | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- .../install/mysql/data/llx_c_currencies.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/data/llx_c_tva.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_departements.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_regions.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- htdocs/install/mysql/tables/llx_commande.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../mysql/tables/llx_commande_fournisseur.sql | 5 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/install/upgrade2.php | 5 +- htdocs/langs/es_ES/html/gpl.html | 330 ++++++ htdocs/langs/nl_BE/html/gpl.txt | 340 ++++++ htdocs/langs/nl_NL/html/gpl.txt | 339 ++++++ htdocs/lib/admin.lib.php | 77 +- htdocs/lib/ajax.lib.php | 5 +- htdocs/lib/pdf.lib.php | 5 +- htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 5 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- htdocs/societe/soc.php | 10 +- .../smartphone/theme/default/default.css.php | 5 +- htdocs/user/group/perms.php | 34 +- htdocs/user/perms.php | 32 +- 339 files changed, 2702 insertions(+), 1572 deletions(-) create mode 100755 build/deb/control.DEBIAN create mode 100644 htdocs/langs/es_ES/html/gpl.html create mode 100644 htdocs/langs/nl_BE/html/gpl.txt create mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index d73d7a99219..edb46ffd5a3 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,13 +22,12 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build binary only package +# dpkg -b To build package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# dpkg-reconfigure -plow package Reconfigure package +# # dpkg -L packagename List content of installed package -# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index 3382966714b..b035f18ae1d 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 + -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN new file mode 100755 index 00000000000..7c66775bdf1 --- /dev/null +++ b/build/deb/control.DEBIAN @@ -0,0 +1,46 @@ +Package: dolibarr +Version: __VERSION__ +Architecture: all +Maintainer: Laurent Destailleur +Installed-Size: 61200 +Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Section: web +Priority: optional +Homepage: http://www.dolibarr.org +Description: Easy to use web based ERP & CRM software + Dolibarr ERP & CRM is an easy to use open source/free software for small + and medium companies, foundations or freelances. It includes different + features for Enterprise Resource Planning (ERP) and Customer Relationship + Management (CRM) but also for different other activities. + It's a web software you can install as a standalone program or on any web + hosting provider to use it from anywhere with any web browser. + Dolibarr was designed to provide only features you need and be easy to use. + . + Only features you need are visible, depending on which module were activated. + Most common used modules are: + . + Customers, Suppliers or Prospects directory, + Contacts directory, + Orders management, + Commercial proposals management, + Invoices management, + Products and services catalog, + Stock management, + Foundations members management, + Bank accounts management, + Point of Sale, + Payments management, + Commercial actions management, + Contracts management, + Standing orders management, + Shipping management, + Donations management, + Bookmarks management, + Mass Emailings, + Reports, + Wizards to export and import data, + LDAP connectivity, + PDF exports, + And a lot of more modules... + . + You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index e28258d8dbc..91f0705c001 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,16 +4,10 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper (>= 7), po-debconf +Build-Depends: debhelper, po-debconf Package: dolibarr -Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, - php5-mysql | php5-mysqli, - php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, - ${misc:Depends}, xdg-utils, - mysql-server, perl -Recommends: apache2 | lighttpd | httpd, mysql-client -Suggests: www-browser +Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl Architecture: all Section: web Priority: optional diff --git a/build/deb/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 b/build/deb/install index 2928d378abc..4d41fd52c65 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,5 +1,4 @@ etc/dolibarr/apache.conf -etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 3bbe762283a..13b8030ed0d 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:49+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,26 +25,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Seveur web à reconfigurer automatiquement:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"dolibarr." -msgstr "" -"Selectionnez le serveur web à configurer automatiquement pour utiliser " -"dolibarr." - # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -52,7 +36,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index d65e5d8b7f6..32c92a97cc4 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,29 +17,15 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"dolibarr." -msgstr "" - #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index e0bba1be4da..ca5fd1645dd 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,5 +1,7 @@ #!/bin/sh # postinst script for dolibarr +# +# see: dh_installdeb(1) set -e @@ -14,31 +16,6 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - - -lighttpd_install() { - if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - if which lighty-enable-mod >/dev/null 2>&1 ; then - echo "Add link for Lighttpd config file" - ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf - # We enabled it - lighty-enable-mod dolibarr fastcgi-php - else - echo "Lighttpd not installed, skipping" - fi - fi -} - -apache_install() { - webserver=$1 - if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Add link for Apache config file" - ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - . /usr/share/debconf/confmodule db_version 2.0 @@ -50,6 +27,8 @@ echo Run the dolibarr postinst script # Define vars docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" installconfig="/etc/dolibarr/install.forced.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php" @@ -65,6 +44,10 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir + # Copy apache.conf file into target directory + #mkdir -p /etc/dolibarr + #cp -p $apachefileorig $apacheconfig + # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -91,15 +74,21 @@ case "$1" in chmod -R 660 $config fi - - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - + # Get the web server type (use db_get for interactive mode). + #db_reset "dolibarr/webserver" + #db_get "dolibarr/webserver" # Read value for webserver. + #webserver="$RET" + + case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; + esac + # Set up web server. - for webserver in $webservers ; do - webserver=${webserver%,} - echo Complete config of server $webserver + for server in $webservers ; do + echo Complete config of server $server # Detect webuser and webgroup webuser= @@ -117,31 +106,26 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config + + # Add link to config file + echo Setup web server $server to add dolibarr config file + ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf + done - # Restart web server. - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_install - else - apache_install $webserver - fi - # Reload webserver in any case, configuration might have changed - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $webserver reload 3>/dev/null || true - else - echo Restart web server $server using $server reload - /etc/init.d/$webserver reload 3>/dev/null || true - fi - fi + # Restart servers + servers="apache2-ssl apache2 mysql" + # Another way to restart + for server in $servers ; do + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $server reload || true + else + echo Restart web server $server using $server reload + /etc/init.d/$server reload || true + fi done - echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -152,13 +136,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument $1" >&2 + echo "postinst called with unknown argument \`$1'" >&2 exit 0 ;; esac -#DEBHELPER# - db_stop +#DEBHELPER# + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 27ce3777b7e..9eae81b022b 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,36 +17,7 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - -lighttpd_remove() { - if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - echo "Remove link for Lighttpd config file" - rm -f /etc/lighttpd/conf-available/50-dolibarr.conf - if which lighty-enable-mod >/dev/null 2>&1 ; then - lighty-disable-mod dolibarr - else - echo "Lighttpd not installed, skipping" - fi - # See bug #448682 - if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then - echo 'Manually deleting lighttpd/dolibarr configuration link' - rm /etc/lighttpd/conf-enabled/50-dolibarr.conf - fi - fi -} - -apache_remove() { - if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Remove link for Apache config file" - rm -f /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule -fi +. /usr/share/debconf/confmodule db_version 2.0 @@ -55,62 +26,63 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" +export webserver="" +# Allows us to loop and substitute in one pass +case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; +esac + case "$1" in # Call when we upgrade upgrade) - echo "postrm upgrade" ;; # Call when we uninstall remove) - echo "postrm remove" rm -f $lockfile - # Reconfigure web server - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - - # Restart web servers - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_remove - else - apache_remove $webserver - fi - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $webserver reload 3>/dev/null || true - else - /etc/init.d/$webserver reload 3>/dev/null || true - fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete link $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge" + echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical dolibarr/postrm || true + db_input critical "dolibarr/postrm" || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get dolibarr/postrm + db_get "dolibarr/postrm" set -e if [ "$RET" = "true" ] ; then @@ -213,12 +185,41 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete file $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" + fi + done + rm -rf /etc/dolibarr + # Restart servers + for server in $restart ; do + # We disable blocking errors + set +e + echo "Restart server $server if exists" + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $server reload || true + else + /etc/init.d/$server reload || true + fi + # We restore blocking errors + set -e + done + # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset dolibarr/reconfigure-webserver - db_reset dolibarr/postrm + db_reset "dolibarr/postrm" set -e #db_purge @@ -228,7 +229,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument $1" >&2 + echo "postrm called with unknown argument \`$1'" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index b96325a4e64..5c06afd8ccd 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,10 +1,3 @@ -Template: dolibarr/reconfigure-webserver -Type: multiselect -Choices: apache2, lighttpd -_Description: Web server to reconfigure automatically: - Please choose the web server that should be automatically configured - to run dolibarr. - Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 20c5ba415e9..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.129 2011/08/01 18:22:26 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -318,9 +318,6 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; } # Build package for each target @@ -572,8 +569,6 @@ if ($nboftargetok) { if ($target eq 'DEB') { - $olddir=getcwd(); - $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -676,22 +671,19 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache and lighttpd conf files + # Apache conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; + + # Dolibarr conf files + # TODO # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -737,15 +729,17 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - # Creation of binary package (to build without sources) - #print "Go to directory $BUILDROOT\n"; - #chdir("$BUILDROOT"); + print "Go to directory $BUILDROOT\n"; + $olddir=getcwd(); + chdir("$BUILDROOT"); + + # Creation of binary package (to build without sources) #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Prepare source package + # Creation of source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -757,7 +751,6 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; - $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -773,9 +766,6 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; - - # Creation of source package - print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/build/rpm/README b/build/rpm/README index c157a195c03..99a1bb3552c 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -10,6 +10,8 @@ with format RPM (for Redhat, Mandriva, ...). # This is standard command to work on Debian packaging: # +# rpmlint file.rpm Test a package +# # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies @@ -40,7 +42,9 @@ different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. I am author of other already packaged OpenSources packages (awstats) but this is my first package to maintain myself. So i'm seeking a sponsor. - - Edit field "Block" and add FE-NEEDSPONSOR - -- Check bug is into database by searching with id on https://bugzilla.redhat.com/ \ No newline at end of file +- Check bug is into database by searching with id on https://bugzilla.redhat.com/ +- Install fedora packager tools: yum install fedora-packager +- Setup fedora packagers tools: fedora-packager-setup +- Send your package: koji build --scratch f16 path_to_source_RPM +- Check if package is available: http://koji.fedoraproject.org/koji/ \ No newline at end of file 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 1754220c6c7..708546cf263 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -48,7 +48,7 @@ AutoReqProv: no %description -Dolibarr ERP & CRM is an easy to use open source/free software for small +An easy to use CRM & ERP open source/free software for small and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. @@ -56,7 +56,7 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Dolibarr ERP y CRM es un software open source/gratis para pequeñas y +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 @@ -65,13 +65,13 @@ solamente las funcionalidades que necesita y haciendo hincapié en su facilidad de uso. %description -l fr -Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, +Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, artisans ou associations. Il permet de gérer vos clients, prospect, fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Dolibarr è un programma gestionale open source e gratuito 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à. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno @@ -101,6 +101,7 @@ 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 cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -153,6 +154,8 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" +export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr" +export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="%{_sysconfdir}/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" @@ -218,7 +221,7 @@ then chmod -R 660 $config fi -# Create a config file $apacheconfig +# Create config file for apache $apacheconfig if [ ! -f $apacheconfig ]; then echo Create dolibarr web server config file $apacheconfig cp $apachefileorig $apacheconfig @@ -226,7 +229,15 @@ if [ ! -f $apacheconfig ]; then chmod go-w $apacheconfig fi -# Create a config link dolibarr.conf for Fedora or Redhat +# Create config file for se $seconfig +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 if [ ! -f $apachelink ]; then echo Create dolibarr web server config link $apachelink ln -fs $apacheconfig $apachelink @@ -359,5 +370,5 @@ rmdir $targetdir/doc >/dev/null 2>&1 #rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm %changelog -* Wed Jul 31 2011 Laurent Destailleur 3.1.0 -- Initial upstream (#723326) +* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 +- Initial version (#723326) diff --git a/build/rpm/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr index 193a43b7dbe..64376e5afb6 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -1,3 +1,3 @@ -/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 -/var/www/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 -/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file +/etc/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 +/var/www/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 +/usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index d7172d651f0..3cc548e1c0a 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -27,7 +27,7 @@ * \file htdocs/includes/modules/modMyModule.class.php * \ingroup mymodule * \brief Description and activation file for module MyModule - * \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $ + * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); @@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='generic'; - // Defined if the directory /mymodule/includes/triggers/ contains triggers or not + // Defined if the directory /mymodule/inc/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. diff --git a/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/proxy.php b/htdocs/admin/proxy.php index f02e3d6203a..2c284c5cae8 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ */ require("../main.inc.php"); @@ -206,5 +205,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); +llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c0aaaa86213..c1d629f7b7b 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ */ require("../main.inc.php"); @@ -348,5 +347,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); +llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); ?> diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index a07b28bd2cf..f478b65e3a8 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.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/constall.php * \brief Page to show all Dolibarr setup (config file and database constants) - * \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $ + * \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $ */ require("../../main.inc.php"); 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/css/style.css b/htdocs/cashdesk/css/style.css index 698cceb4966..c79d46fbeb5 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,10 +11,11 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ +/* \version $Id$ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index 2d89cfd2388..f91946e11c0 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.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. */ // Instanciation et initialisation de l'objet xmlhttprequest 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/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 96de90124f9..259dc4dbce5 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -47,7 +48,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -66,7 +67,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -77,17 +78,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 5ba2ef8997e..0c262ba2936 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ */ require("./pre.inc.php"); @@ -386,5 +385,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); +llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 9ee1f551048..525160df9ef 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ */ require("./pre.inc.php"); @@ -608,5 +607,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); +llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); ?> diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 0efb704828f..e05eaa66ecf 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ + * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ */ require('../main.inc.php'); @@ -1031,5 +1032,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); +llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 5da397b4183..d2f2a7aae7e 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ + * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ */ require('../main.inc.php'); @@ -672,5 +673,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); +llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); ?> diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 689e2639773..79d00ae00c7 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ + * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -276,5 +275,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); +llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); ?> diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index e24b3c7c717..cb4a0f7a5cf 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -23,14 +23,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.193 2011/07/31 23:45:14 eldy Exp $ + * \version $Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $ */ @@ -160,10 +161,8 @@ class Form $htmltext=str_replace("\n","",$htmltext); $htmltext=str_replace('"',""",$htmltext); - if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip - else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag - if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip - else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip + $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag $s=""; if (empty($notabs)) $s.=''; diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 2ca2f82789e..8deeda0fb57 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/interfaces.class.php * \ingroup core * \brief Fichier de la classe de gestion des triggers - * \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $ */ diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 13a97bf54b3..3148174f5af 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,15 +20,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -65,7 +64,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 6f6c7ed2a1b..257b95e4e3c 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -64,7 +65,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.31 $'); + $ver=explode(' ','$Revision: 1.30 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 446606ef055..127eb16e389 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -63,7 +64,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
          This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.28 $'); + $ver=explode(' ','$Revision: 1.27 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 46fa4c9ccc4..9c90d1fcc94 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,7 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program. If not, see . +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* or see http://www.gnu.org/ */ /** @@ -20,7 +22,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -59,7 +61,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
          This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.14 $'); + $ver=explode(' ','$Revision$'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index 7055bef4b69..ec7e1af07c6 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ + * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/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/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index 067e831b0b4..b1e3f5a2638 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,503 +1,504 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index e5f0ff4c0e5..b1e3f5a2638 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,7 +484,8 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/index.php b/htdocs/index.php index 5998094d362..f027e94a35a 100644 --- a/htdocs/index.php +++ b/htdocs/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/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -574,7 +573,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); +llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); /** diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 1d2084e7c7f..9978c8f437a 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/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.24 2011/08/03 01:32:42 eldy Exp $ + * $Id$ */ body { diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 275298588e2..9d08a56e41c 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,9 +17,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_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index da244f79951..56ceea3d807 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,9 +17,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_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index eee5dfa185a..3a248c2f49f 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,9 +18,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_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index e3922b97f65..dcbaf2faaf4 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,9 +17,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_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index b7f6c71c87e..1dd3cb59a62 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,9 +11,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_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index f3299990858..5e93e39d048 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,9 +17,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_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index 1f14cc8c142..e3ed8196d17 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,9 +17,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_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 5017ce0c60d..176e5c796e2 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,9 +17,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_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql index eeb2c376b85..ad7c175fcc4 100644 --- a/htdocs/install/mysql/data/llx_c_currencies.sql +++ b/htdocs/install/mysql/data/llx_c_currencies.sql @@ -17,9 +17,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_c_currencies.sql,v 1.8 2011/08/03 01:25:46 eldy Exp $ +-- $Id: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index f58db2b32a6..db630463dbf 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,9 +17,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_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index 079caa7dde4..c67d263853d 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,9 +17,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_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 4bb81528e74..07fa2abaa83 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,9 +18,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_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index 720413ac480..e29b3f306f5 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,9 +17,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_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index cb0b557b438..c7fa6b6dd1f 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.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_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index a3a19cc2125..6a597996424 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,9 +17,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_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 1ec498e6bc2..78e174b9817 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,9 +17,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_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a17978bb0c..3a535a5098e 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,9 +17,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_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index 96d456312df..f6395abbfcd 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,9 +17,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_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 488b0a564eb..9c28f697f83 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,9 +17,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_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index d8701c52c01..988d9c26136 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,9 +17,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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- @@ -33,4 +34,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2fd47385a90..2d1a3c62a39 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,9 +17,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_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 788e9e82f39..056dbdbdb6e 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -18,9 +18,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_c_tva.sql,v 1.27 2011/08/03 01:25:44 eldy Exp $ +-- $Id: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index da98640fd25..4238000eb14 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,9 +17,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_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 789ad16fce2..6e596be24e5 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,9 +17,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_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index 48b77951e1f..e2faed3cba3 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,9 +17,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_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index 59bd3d1ef00..cf7e9e96275 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,9 +17,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_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index cd2f27a5dca..655848a50ae 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.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: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 42f86f1c447..968a131e2bb 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -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: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 685170362fd..6e6e960072b 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.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_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 921bc569980..02ff06ba9f1 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.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_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index d5902b539c7..f22262c9353 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.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_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index ddd3d734ff7..b2cdf08af5f 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.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_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 8c5c23bbe62..031bfb614e1 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -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: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index f7b876eed86..3aa9555979e 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -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: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 8d34e2a9c78..4703aa32ddd 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -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: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index ad6f448e3dc..69bf706ca68 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,9 +15,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_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 51d66c04584..9156b439833 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,9 +15,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_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index 7df7f21a3b9..db64e0cbf9c 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -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: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index 31676d7d6e2..a7efcbd0f6d 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -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: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index bc9d9ad0936..7e4fa074e71 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -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: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index 18eed730ab8..d23a1367f92 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index ade41da746e..2b2db5af657 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index 62a88236480..b5c9175202b 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 015a9e9b4c0..6ed1e00dd88 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index 296b49fc93f..d1279c21eb2 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 9cedf70e7ca..822a69bc4ec 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index 55718d8ffb5..aba765190ee 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.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_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index abc9baa2d8c..eded16c49fe 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -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: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index 3dd83585bcd..e39fbf71f12 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -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: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 217edcaddbb..3710a87470a 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -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: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index 5869f24d8bd..ad41449f288 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -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: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index 5db17f19069..f6301a24919 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index 5f66ff625f0..cd68a9cdb40 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index b0546729ef0..890c7597862 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.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_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index 4794113f8bd..d67cf7fe4b8 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -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: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5fc25f57339..5c06c73c69d 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 5746cce26aa..115bd310d70 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index ba1e56e2b94..d3c71cc4a70 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.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_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index de9c23e9c05..10c4cc2d853 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,10 +13,11 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, 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_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index cce9d04707b..09365976d78 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.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_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 93e8e3d99a7..463b1235094 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -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: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index b0f31fe7116..c81a2b3e830 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -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: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index cb2251cfaf6..821fe3e5c04 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -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: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 8bebcf13116..9380607010d 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index b30354cae19..e524d9c937a 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index b026a40d762..0b0b34390c4 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -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: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 39d21cee7b9..7b5fa661d7d 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -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: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index d1e6b216b4b..e2f225fe608 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.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_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 60af7723f30..66cd5111325 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -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: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index cb223ae5532..ebca12ab5da 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -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: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 415b8526793..3872bedd39d 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -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: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index 5c54695f608..bed4ad41dfc 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 93ef5d59770..23cd0f575ed 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index 7702a8cf21e..f46d2a56c33 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.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_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_departements.sql b/htdocs/install/mysql/tables/llx_c_departements.sql index ea1f7543428..ab0ea5dc0c3 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.sql @@ -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: llx_c_departements.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id: llx_c_departements.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ -- ======================================================================== create table llx_c_departements diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 46a35567e95..4669de108f4 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.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_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index c2c43a3a625..a6bb8ca70f7 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -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: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 547500d7f33..5637e5a987d 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -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: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index bf7ed18af80..884d8274cfd 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.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_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index d0dceaf0fe1..2b6dea6cbd3 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -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: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 192183be0c1..76aecebbb9a 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -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: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index d6d673962b9..665a210d74b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -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: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index c8deefef6d7..7fcd57e31eb 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -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: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index 757653f1fc2..e1cab3b3368 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -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: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f2fb7fda4d3..f97e458be6b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -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: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 7a228ec1572..165a8550331 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -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: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 120e27ae77d..6efa388ef81 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.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_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index a5e3fd8721b..c8824b2d04e 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.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_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 418e37a85b1..311183c87f4 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.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_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 1cc5dbfaf0e..2d00f620e02 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -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: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 84c72e0839b..02052920c8a 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -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: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 8cf0ec900f8..0f608cbc171 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.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_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 2eed307bc54..75b40946559 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.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_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql index 5ef6fb221e6..d9d0f2d1b0c 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.sql @@ -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: llx_c_regions.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id: llx_c_regions.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ -- ======================================================================== create table llx_c_regions diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index c977dd9dd21..76caf44356d 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 8307ca88eb6..861671e3607 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -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: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 9a7bda88c28..46504e8a1c4 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -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: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index 725ddbfeb90..dc284fc8cea 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -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: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index a1feeb33f8b..4f8736a3a14 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -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. -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -23,7 +24,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 1e141b7768a..85ea592d950 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -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: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 79d54faf623..9fad6cc333e 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -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: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index 97638937c74..d6bd27758b4 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -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: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 211af70a854..40759cdc50b 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.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_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 7c4c534451d..80e73c43399 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -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: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index f2330322a5f..4c466e0c02b 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -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: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 8e4492c28a9..46a39b3c9e7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -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: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 39be52cf374..60641bf1876 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -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: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index e93ce9b4354..cfe126b5adf 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.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_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index baa01289b96..7e12e06beb7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -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: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index bd19d25f1a5..83eb804c875 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -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: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index eb95b9fe66c..6236e113766 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -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: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index 2c95fde3255..cf5121c34f9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -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: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index d62011351c4..cabdcce3a80 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index a07ff049d61..ebaf9582414 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index 730bc11ac98..fa9a85aac1f 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -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: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index 6f129f2feec..ec8931763bf 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -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: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 731cf8fb0f4..9c6e2a065f8 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -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: llx_commande.sql,v 1.14 2011/08/03 01:25:34 eldy Exp $ +-- $Id: llx_commande.sql,v 1.13 2011/07/28 22:22:31 eldy Exp $ -- =================================================================== create table llx_commande diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 172a2432ee1..7958b56f354 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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. -- --- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orphelins pour permettre mont�e de la cl� +-- Supprimme orphelins pour permettre monte de la cl -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index f1c8c7ac579..3ef51d6ae21 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -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: llx_commande_fournisseur.sql,v 1.8 2011/08/03 01:25:32 eldy Exp $ +-- $Id: llx_commande_fournisseur.sql,v 1.7 2011/07/28 22:22:31 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index c13c0aa6019..3f848c9ffe2 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index f0c65456e5c..df6d49827f6 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index be4e60a9a97..9bb45f9d326 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -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: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 23cfd068495..91914ab66c7 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -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: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b18165255..d1b39863cab 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -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: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index 19ec675f973..e964fbc2f5e 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -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: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a53a24d9a66..a747c714fb3 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.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_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 46639ca7c1e..16ecb365d6c 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.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_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index d1ba0645e05..bfce896eb19 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.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_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index b7fc52403af..51234007ee1 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.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_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index 4187f526393..eead2907fa2 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,9 +15,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_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 7b74d8b506d..1c757fa6c86 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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. -- --- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orhpelins pour permettre mont�e de la cl� +-- Supprimme orhpelins pour permettre monte de la cl -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index f1f4a75b604..79b52ba399c 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -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: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 39b89773316..3757e4522bf 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -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: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index 98b29b1f715..f5987250001 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -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: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 0eb566317d0..9c4a5e340ab 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 3fb9f7d6d2d..906d0a3e2f4 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index ba595100b5f..20bb329ff0e 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index b71d2697b85..2063a310fb8 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index 61d63046fac..a99b42859c7 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -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: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index 0e20201f4cb..f0e0a065089 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.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_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 154f0b51006..06af8a78575 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.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_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1dc4941012a..1c5d5c30173 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -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: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index a208aa5fff0..e43f4cb118c 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -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: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index f60029ee290..e4eb41f3bb4 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.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_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 2833920b746..463675b10b7 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -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: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index 7987ca819c1..fc998bd6edb 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.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_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index e027d471e23..1e9b0495d34 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -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: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ +-- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index 8b279dc578b..b899c4303e1 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.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_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 684c5aa5a7c..5d6d86617e6 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -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: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index cdccf3eb6ec..6de1b23eb64 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.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_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index fee45753759..04491e0878c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -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: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 9401f679071..575930a728c 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -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: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 757e8d2b447..46b769b8afc 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.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_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index d0118ebdc6c..e1b82141ea1 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 57d92bc8ce9..19824c860de 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 6f2ddcf56b9..455916a3010 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.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_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 6cf13137710..94e726796c5 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.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_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index cee3ace0ec3..8dbbb572f29 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -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: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 34d0bbac03b..923c2441987 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.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_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index ef97e48a251..88cf83a3cc3 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -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: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index b674a0cf11d..68e21d26061 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -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: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index 5e3620cba87..f289b9cb514 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -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: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index bd3c0c7d780..a2e54d34770 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -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: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index 1524eb7a77b..dbeec277f88 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -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: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index 75a4ce8fd06..e3e5900fb74 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.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_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index eafe6bd31e1..0669065b7d3 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -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: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index 6a06c0c70b5..dcca0174817 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -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: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index d4aa4b26d99..99cf1edd744 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.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_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index b55d734674f..415b44c6a35 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -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: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index 22a5b9d5c52..ba8b40b3c0a 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -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: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 5edbea4808d..40e131fefdf 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,9 +15,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_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index 5313952606a..bc11ca42c8f 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -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: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index c210f906b9b..8d4a4ecdcbf 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,9 +15,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_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index 29598bb4963..f43ab1e746a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.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_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index cfaad1061df..a52d3ed4a8b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -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: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 521d666742d..4e9f0d1da0e 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -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: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index 29af17f7c08..c9891219f4f 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,9 +15,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_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 917d6fc5cdf..6b8f7176dee 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -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: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 87245438b4d..399dd175311 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,9 +15,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_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index 373267c8921..c06074d4709 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,9 +15,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_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index b67427b9de8..1e3f21d0eb7 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.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_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 8f00ee95200..08450aa204f 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -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: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index edc76a392b0..9b0104ccfe5 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.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_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 302248ae299..0782e089170 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -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: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 9c741080a27..68b6cd9a315 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 4dd0ae15ad4..177be65fb88 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index ffc0666074d..d573c90eb18 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -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: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index 96f122e59cd..e0b2c2494ad 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -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: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 4beccac04b8..92000240642 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -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: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 484cebf6a2a..6240a2ed5c0 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -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: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index a56201f7dba..e2c4be38a5f 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -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: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 84f6077e5ba..51e133a86dc 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.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_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index 46685416239..aab9c69c1a7 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -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: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index 1d41d1ab59e..dc9732c0719 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -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: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index d6dd854a240..663adaffe60 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -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: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 0b7d6a61f56..73dc6489461 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -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: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index c1ee00edd07..0b42446740b 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.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_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index d694d696801..7d728850185 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -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: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index 925ca9eee81..d062249c3b8 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f67337de388..f33c92ea7fe 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 8c8454fbc28..92f21a35f28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.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_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index 6c673570cfc..e62275df23d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -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: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 9c05ed97a8d..29ad3853f90 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Oc�bo +-- Copyright (C) 2005 Marc Barilley / Ocbo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -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: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b127b194fa5..b9ba378d81f 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -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: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 5c8ea94ed09..8771b0ddda8 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.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_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 94ba92d4856..8bb011f7280 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.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_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 4017ae32682..1aba5d286d1 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -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: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index 2c77ae3447c..e0c4fd61701 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -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: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 52c0a3e2a03..1e721e86788 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.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_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index 439b2a68098..d4ea3ad5535 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.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_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index f01b7d02e8e..6f8d6a8cf97 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -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: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index bd1e805aed2..854ec6e826e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.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_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index bfc2162ceca..f1e90520593 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.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_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 784e3d37507..15d3bda5ba2 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -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: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 029bc528b6e..66a61851cae 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,9 +15,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_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 9c066c54436..195d2464738 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.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_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index f4e38524d25..44a301a2db7 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -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: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index f03d92ce651..237b5c23030 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.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_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 2c9c2d929db..3bec7551161 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index d9e9ecd43a7..45845593162 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 01cabfec865..672374961d5 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -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: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index 696cf49c337..d8d9443595d 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -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: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index 170bd56f390..f21fed4d1af 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -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: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index 5a3d71b489a..a501b4db4b6 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -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: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index d29449c2503..41a91a9aa5f 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.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_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index 86f114d395b..e12dbc6fb12 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -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: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index ce320558709..1a83bee6508 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -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: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 76f76ff08ed..93a28593f8e 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -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: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index 133687c7466..ec2bb01863b 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -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: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 6ccd3aa39fb..552a985abd4 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -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: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index e24a8918c5b..63b28ac8410 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -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: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index 26e451271cb..e7ccde53858 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -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: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index 40b07d29305..a1619df5cb5 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -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: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index e21669e63d7..309c60b660f 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.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_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index d094512d975..c92472f7af5 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -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: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index a75fb9aa76d..3fb70995900 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,9 +15,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_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ +-- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index a0d88737e3f..e7fc66a0ed6 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.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_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 9e28a37d6bb..57b252ed2ea 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -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: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index 376447586c9..b8453ea821c 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.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_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index e7528a03f28..00268974476 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -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: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 4f994cf57aa..16bf4dea7f0 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.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_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index 1a7fdfd755f..eff6387abee 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,9 +15,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_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index a618e3d8790..f53599483a4 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -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: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index 902f2b4fd5f..b9643f019c3 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.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_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index 1f5500e2eb1..db4cdd2581c 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -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: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index c7d84e27326..6bf45f749f5 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 523eb3b37e0..7db41de673c 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index bf057b4ad75..8dc4636c87e 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -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: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index ade6a40a80d..d500fc1b7cb 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.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_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index bca670bbb98..a515ba541bf 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -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: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index 7481589df00..b742b82dafc 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -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: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index 4adaa1a56ff..fff909a0ec8 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -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: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index 16631c76b76..fb65e9b7e84 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -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: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 3df14473a7e..332b1305d38 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.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_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index c3958313ea3..ca4206eb6fc 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -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: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 910d2ab2072..68e1d4f20e9 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -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: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 5c7f2e9a59c..8714e7e4a07 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -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: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index cbaadb10091..7d3b0eecd98 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.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_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index e88665b5a34..8bdd7193d1a 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -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: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 86916c216a2..367d45e8525 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -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: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 23065b261c8..28b28aeb762 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -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: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index 3f58eaf698b..d78db14c30b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -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: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 18924ff6ac5..68e46fd120d 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.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_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 8056a150fc3..6acb2db4585 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.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_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 1b5ea5516d4..838f502bfdb 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -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: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index e61985c7dd1..f21099e9c5e 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -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: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index 7bf81b7fbe9..f771be5ef5a 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.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_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 1fb0d708dfa..0033bca36bc 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.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_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 6df43634ec4..8037c9cd7e5 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -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: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 7b6cbd91645..99234b6660f 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index 810781ed6d9..dca8e80f856 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index 2e89f083575..f3a58aa1433 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.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_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index fd656c736ef..98c56c37567 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -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: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 87f6416c6c5..100d9fe82b0 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -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: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- ============================================================================ CREATE LANGUAGE plpgsql; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 9c4c3b41812..b588fe56702 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/upgrade2.php * \brief Upgrade some data - * \version $Id: upgrade2.php,v 1.187 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: upgrade2.php,v 1.186 2011/07/28 15:30:27 eldy Exp $ */ include_once('./inc.php'); diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html new file mode 100644 index 00000000000..38e0f007a15 --- /dev/null +++ b/htdocs/langs/es_ES/html/gpl.html @@ -0,0 +1,330 @@ + + + + + + + + +H. Licencia Pública GNU + + + + + + + + + + + + + +

          Licencia Pública GNU

          + + + + +
          + +GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 + +
          + +

          Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, + MA 02139, USA.

          +

          Está permitido, a cualquier persona, copiar y distribuir copias tal cual de + este documento de licencia, sin la introducción de cualquier cambio. +

          + +
          +

          Introducción

          +

          Las licencias de muchos softwares se desarrollan para asegurar la libertad + de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, + al contrario, pretende garantizar la libertad de compartir y alterar softwares + de libre distribución - volviéndolos de libre distribución también para cualquier + de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares + de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla + (algunos softwares de la FSF son cubiertos por la GNU Library General Public + License).

          +

          Cuando nos referimos a softwares de libre distribución, nos referimos a la + libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar + la libertad de distribución de copias de softwares de libre distribución (y + cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos + fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se + hacen algunas restricciones, para asegurar los derechos de los programadores, + prohibiendo a todas las personas su negación o la solicitación de su abdicación. + Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución + o modificación del software.

          +

          Por ejemplo, al distribuirse copias de determinado programa, por una tasa + determinada o gratuitamente, se debe informar sobre todos los derechos incidentes + sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia + Pública General GNU.

          +

          La protección de los derechos envuelve dos pasos: (1) copyright del software + y (2) licencia que da permiso legal para copia, distribución y/o modificación + del softwares.

          +

          Aún para la protección de la FSF y del autor es importante que todos entiendan + que no hay garantías para softwares de libre distribución. Si software se modifica + por alguien y lo pasa adelante, este software no más reflejará el trabajo original + del autor no pudiendo, por consiguiente, ser garantizado por aquél.

          +

          Finalmente, cualquier programa de libre distribución está constantemente amenazado + por las patentes de softwares. Buscamos evitar el peligro de que distribuidores + de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. + Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación + de patente se debe hacer permitiendo el uso por cualquier individuo, sin la + necesidad de licencia de uso.

          +

          Los términos y condiciones precisas para copia, distribución y modificación + siguen abajo:

          +
          +

          Licencia Pública General GNU

          +

          TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN +

          + +
            + +

          1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga + un aviso colocado por el detentor de los derechos de autor diciendo que aquel + podrá ser distribuido en las condiciones de la Licencia Pública General. El + Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado + en un Programa y significa tanto el propio Programa, como cualquier de los + trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, + un trabajo que contenga el Programa o una parte de este, en su forma original + o con modificaciones o traducido para una otra lengua (la traducción está + incluida sin limitaciones en el término ``modificación'').

            +

            Actividades distintas de copia, distribución y modificación no están cubiertas + por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa + no está restringido y la salida del Programa está cubierta solamente en + el caso de que su contenido contenga trabajos basados en el Programa (independientemente + de que hayan sido creados por la ejecución del Programa). Si esto es así, + depende de las funciones ejecutadas por el Programa.

            2. + +

          2. El código fuente del Programa, de la forma como fue recibido, puede ser + copiado y distribuido, en cualquier media, desde que sea providenciado un + aviso adecuado sobre los copyrights y la negación de garantías, y todos los + avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, + estén inalterados y que cualquier producto oriundo del Programa esté acompañado + de esta Licencia Pública General.

            +

            Está permitido el cobro de tasas por el acto físico de transferencia o + grabación de copias, y pueden ser dadas garantías y soporte en cambio del + cobro de valores.

            3. + + +
          3. +

            Se puede modificar la copia o copias del Programa de cualquier forma que + se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir + tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

            + +
              +

            1. Debe existir un aviso destacado de que los datos originales fueron alterados + en los archivos y las fechas de los cambios;

              2. + +

            2. Debe existir un aviso de que el trabajo distribuido o publicado es, + de forma total o parcial, derivado del Programa o de alguna parte suya, + y que puede ser licenciado totalmente sin costes para terceros bajo los + términos de esta Licencia.

              3. + +

            3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, + en el inicio de tu ejecución, presentar la información de copyright y + de ausencia de garantías (o de que la garantía es de responsabilidad de + terceros), y que los usuarios pueden redistribuir el programa bajo estas + condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

              4. +
            + + Estos requisitos se aplican a trabajos de modificación en general. Si + algunas secciones identificables no sean derivadas del Programa, y pueden + ser consideradas como partes independientes, entonces esta Licencia y sus + Términos no se aplican a aquellas secciones cuando distribuidas separadamente. + Pero al distribuir aquellas secciones como parte de un trabajo basado en + el Programa, la distribución, como un todo, debe contener los términos de + esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no + a cada una de las partes independientemente de quem los tenga desarrollado. + Más que tener intención de contestar los derechos sobre el trabajo desarrollado + por alguien, esta sección objetiva propiciar la correcta distribución de + trabajos derivados del Programa. + Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado + en él ni a un trabajo basado en él, a un volumen de almacenaje o media de + distribución no obliga la utilización de esta Licencia y de sus términos + al trabajo. +
            4. + + +
          4. +

            Están permitidas, la copia y la distribución, del Programa (o un trabajo + basado en éste) en la forma de código objeto o ejecutable de acuerdo con los + términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

            + +
              +

            1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos + en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada + para manejo de softwares o

              +
              2. +

            2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, + de poner a disposición a terceros, por un coste no superior al coste del + medio físico de almacenaje, una copia completa de los códigos fuente en + medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

              +
              3. +

            3. Esté acompañada con la misma información recibida en relación con la + oferta de la distribución del código fuente correspondiente (esta alternativa + solamente está permitida para distribuciones no comerciales y solamente + si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, + de acuerdo con la sección 2 arriba).

              +
              4. +
            + El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones + en aquel trabajo. Cuando se habla en códigos fuentes completos significa + hablar de todos los fuentes de todos los módulos, además de las definiciones + de interfaces asociadas, archivos, scripts utilizados en la compilación + y instalación del ejecutable. Como una excepción excepcional, el código + fuente distribuido podrá no incluir algunos componentes que no se encuentren + en su escopo, como compilador, kernel, etc... para el SO donde el trabajo + sea ejecutado. + Si la distribución del ejecutable o objeto se hace, a través de acceso + a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente + de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos + con los objetos simultáneamente +
            5. + +
          5. +

            No está permitida la copia, modificación, sublicenciamiento o distribución + del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier + tentativa de copia, modificación, sublicenciamiento o distribución del Programa + está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. + Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, + no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas + de esta Licencia.

            6. +
          6. +

            No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá + documento o contrato que garantice permiso de modificación o distribución + del Programa o sus trabajos derivados. Estas acciones están prohibidas por + ley, en el caso de que no se acepten las condiciones de esta Licencia. La + modificación o distribución del Programa, o cualquier trabajo basado en éste, + implica en la aceptación de esta Licencia y de todos los términos de ésta + para copia, distribución o modificación del Programa o trabajos basados en + éste.

            7. +
          7. +

            Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), + el recipiente automáticamente recibe una licencia del detentor original de + los derechos de copia, distribución o modificación del Programa objeto de + estos términos y condiciones. No pueden ser impuestas otras restricciones + en los recipientes.

            8. + +
          8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes + o derechos de autor, se impongan restricciones, que contradigan esta Licencia, + estos no exentan de su aplicación. Si no es posible distribuir el Programa + de forma a garantizar simultáneamente las obligaciones de esta Licencia y + otras que sean necesarias, entonces el Programa no podrá ser distribuido. +

            Si esta Sección se considera, inválida por cualquier motivo particular + o general, su resultado implicará en la invalidación general de esta licencia + en la copia, modificación, sublicenciamiento o distribución del Programa + o trabajos basados en éste.

            +

            El propósito de esta sección no es, de forma alguna, incitar a quien quiera + que sea a infringir derechos reclamados en cuestiones válidas y procedentes, + y si proteger las premisas del sistema de libre distribución de software. + Muchas personas tienen hecho contribuciones generosas al sistema, en la + forma de programas, y es necesario garantizar la consistencia y credibilidad + del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución + de los softwares.

            +

            Esta sección pretende hacer claro los motivos que crearan las demás cláusulas + de estas Licencia.

            9. + +
          9. +

            Si la distribución del Programa, dentro de los términos de esta Licencia, + tiene restricciones en algún País, por patentes o derechos de autor, el detentor + original de los derechos de autor del Programa bajo esta Licencia puede adicionar + explícitamente limitaciones geográficas de distribución, excluyendo aquellos + Países, haciendo con que la distribución solamente sea posible en los Países + no excluidos.

            10. + +
          10. +

            La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) + puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública + General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos + objetivos y el espirito de la presente versión, pudiendo variar en detalles + referentes a nuevas situaciones encontradas.

            +

            A cada versión se da un número distinto. Si el Programa especifica, un + número de versión determinado de esta Licencia, que tenga en su contenido + la expresión ``o versión más actualizada'', es posible optar por las condiciones + de aquella versión o de cualquier versión más actualizada publicada por + la FSF.

            11. + +
          11. +

            Si deseas incorporar parte del Programa en otros programas de libre distribución + de softwares hace falta autorización formal del autor. Para softwares que + la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde + que mantenido el espirito y objetivos originales de esta Licencia.

            12. +
          + +

          AUSENCIA DE GARANTÍAS

          +
            +

          1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER + GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE + EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS + DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, + LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD + Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS + CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y + REPAROS JUZGADOS NECESARIOS.

            2. +

          2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR + LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN + RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE + HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS + O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES + O DAÑOS.

            +

            FIN DE LA LICENCIA

          + + +
          +

           

          +

          Apéndice

          +

          ¿Cómo aplicar estos términos a nuevos softwares?

          +

          Si has desarrollado un nuevo programa y deseas su amplia distribución para + el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, + que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

          +

          Para esto basta con anexar este aviso al programa. Se recomienda indicar aún + en el inicio de cada archivo fuente la ausencia de garantías y una anotación + de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

          +

          <nombre del programa y función> Copyright (C) 199X <Autor> +

          +

          Este programa es un software de libre distribución, que puede ser copiado + y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo + con la publicada por la Free Software Foundation, versión 2 de la licencia o + (a criterio del autor) cualquier versión posterior.

          +

          Este programa se distribuye en la expectativa de ser útil a sus usuarios, + pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE + ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General + 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. +

          +

          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:

          +

          Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares + NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software + de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. + Teclea 'muestra condic' para mayores detalles.

          +

          Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las + partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos + pueden variar o pueden ser accionados por otras interfaces como clic de ratón, + etc...

          +

           

          +
          +
          + +www.conectiva.com + +
          + + + + + diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt new file mode 100644 index 00000000000..3efbe1ccee7 --- /dev/null +++ b/htdocs/langs/nl_BE/html/gpl.txt @@ -0,0 +1,340 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +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 new file mode 100644 index 00000000000..778e2b02b41 --- /dev/null +++ b/htdocs/langs/nl_NL/html/gpl.txt @@ -0,0 +1,339 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van +deze licentie. \ No newline at end of file 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/ajax.lib.php b/htdocs/lib/ajax.lib.php index 55def736688..7db1908bc49 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ */ diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index e2a33296bee..263e18df269 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -16,7 +16,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ @@ -24,7 +25,7 @@ * \file htdocs/lib/pdf.lib.php * \brief Set of functions used for PDF generation * \ingroup core - * \version $Id: pdf.lib.php,v 1.99 2011/07/31 23:25:42 eldy Exp $ + * \version $Id: pdf.lib.php,v 1.98 2011/07/27 17:28:42 eldy Exp $ */ diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 49b67f9349a..1bdeb9562e6 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 03ef2767e40..1d5b4951490 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -21,8 +21,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -30,7 +29,7 @@ * \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.350 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: master.inc.php,v 1.351 2011/07/31 23:19:04 eldy Exp $ */ diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index d6bf7267439..454073d9730 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 6e1e7b262f4..b5304ba4198 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index b0a7c2dece6..bda35165079 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.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/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ + * \version $Id$ */ if (session_id() == "") session_start(); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1da2adb751e..8bccf934120 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index a65f888ab11..efbd289cb3f 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ */ require("../main.inc.php"); @@ -1646,6 +1645,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); +llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 79601ea1031..8f373b577e8 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 8cf57ec0b64..724900dc500 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ + * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ */ require("../main.inc.php"); @@ -272,5 +271,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); +llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); ?> 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/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index e78dff8f646..f93935ffb16 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.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/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ + * \version $Id$ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal 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 $'); ?> From 69e251e6d4569f228dcc1c585369de7ee7e927e1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:22:37 +0000 Subject: [PATCH 039/118] Fix: Avoid errors into rpm packages --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/control.DEBIAN | 46 ----- build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 + build/deb/install | 1 + build/deb/po/fr.po | 22 ++- build/deb/po/templates.pot | 20 ++- build/deb/postinst | 100 ++++++----- build/deb/postrm | 119 +++++++------ build/deb/templates | 7 + build/makepack-dolibarr.pl | 163 ++++++++++-------- 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 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 35 +++- htdocs/admin/perms.php | 34 +++- htdocs/boxes.php | 6 +- htdocs/cashdesk/tpl/menu.tpl.php | 13 +- htdocs/cashdesk/tpl/validation1.tpl.php | 21 ++- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/core/class/conf.class.php | 9 +- htdocs/core/class/cookie.class.php | 5 +- htdocs/core/class/html.form.class.php | 11 +- htdocs/core/class/interfaces.class.php | 5 +- htdocs/imports/import.php | 7 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- htdocs/install/check.php | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 5 +- .../mysql/data/llx_20_c_departements.sql | 5 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- .../install/mysql/data/llx_c_currencies.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/data/llx_c_tva.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_departements.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_regions.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- htdocs/install/mysql/tables/llx_commande.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../mysql/tables/llx_commande_fournisseur.sql | 5 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../tables/llx_product_fournisseur.key.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/install/upgrade2.php | 5 +- htdocs/lib/admin.lib.php | 77 +++++++-- htdocs/lib/ajax.lib.php | 5 +- htdocs/lib/pdf.lib.php | 5 +- htdocs/master.inc.php | 6 +- htdocs/societe/soc.php | 10 +- htdocs/user/group/perms.php | 34 +++- htdocs/user/perms.php | 32 +++- 325 files changed, 1191 insertions(+), 1293 deletions(-) delete mode 100755 build/deb/control.DEBIAN diff --git a/build/deb/README b/build/deb/README index edb46ffd5a3..d73d7a99219 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build package +# dpkg -b To build binary only package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# +# dpkg-reconfigure -plow package Reconfigure package # dpkg -L packagename List content of installed package +# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index b035f18ae1d..3382966714b 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 + -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN deleted file mode 100755 index 7c66775bdf1..00000000000 --- a/build/deb/control.DEBIAN +++ /dev/null @@ -1,46 +0,0 @@ -Package: dolibarr -Version: __VERSION__ -Architecture: all -Maintainer: Laurent Destailleur -Installed-Size: 61200 -Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl -Section: web -Priority: optional -Homepage: http://www.dolibarr.org -Description: Easy to use web based ERP & CRM software - Dolibarr ERP & CRM is an easy to use open source/free software for small - and medium companies, foundations or freelances. It includes different - features for Enterprise Resource Planning (ERP) and Customer Relationship - Management (CRM) but also for different other activities. - It's a web software you can install as a standalone program or on any web - hosting provider to use it from anywhere with any web browser. - Dolibarr was designed to provide only features you need and be easy to use. - . - Only features you need are visible, depending on which module were activated. - Most common used modules are: - . - Customers, Suppliers or Prospects directory, - Contacts directory, - Orders management, - Commercial proposals management, - Invoices management, - Products and services catalog, - Stock management, - Foundations members management, - Bank accounts management, - Point of Sale, - Payments management, - Commercial actions management, - Contracts management, - Standing orders management, - Shipping management, - Donations management, - Bookmarks management, - Mass Emailings, - Reports, - Wizards to export and import data, - LDAP connectivity, - PDF exports, - And a lot of more modules... - . - You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index 91f0705c001..e28258d8dbc 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,10 +4,16 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper, po-debconf +Build-Depends: debhelper (>= 7), po-debconf Package: dolibarr -Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, + php5-mysql | php5-mysqli, + php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, + ${misc:Depends}, xdg-utils, + mysql-server, perl +Recommends: apache2 | lighttpd | httpd, mysql-client +Suggests: www-browser Architecture: all Section: web Priority: optional diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index a48e5048dff..f4b471edf13 100644 --- a/build/deb/dolibarr.desktop +++ b/build/deb/dolibarr.desktop @@ -3,10 +3,14 @@ # It must be saved into directory /usr/share/applications Version=1.0 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM +Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations +Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/deb/install b/build/deb/install index 4d41fd52c65..2928d378abc 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,4 +1,5 @@ etc/dolibarr/apache.conf +etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 13b8030ed0d..3bbe762283a 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:49+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,10 +25,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "Seveur web à reconfigurer automatiquement:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" +"Selectionnez le serveur web à configurer automatiquement pour utiliser " +"dolibarr." + # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -36,7 +52,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index 32c92a97cc4..d65e5d8b7f6 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:52+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,15 +17,29 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: multiselect #. Description #: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:2001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index ca5fd1645dd..e0bba1be4da 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,7 +1,5 @@ #!/bin/sh # postinst script for dolibarr -# -# see: dh_installdeb(1) set -e @@ -16,6 +14,31 @@ set -e # for details, see /usr/share/doc/packaging-manual/ + + +lighttpd_install() { + if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + if which lighty-enable-mod >/dev/null 2>&1 ; then + echo "Add link for Lighttpd config file" + ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf + # We enabled it + lighty-enable-mod dolibarr fastcgi-php + else + echo "Lighttpd not installed, skipping" + fi + fi +} + +apache_install() { + webserver=$1 + if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Add link for Apache config file" + ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + . /usr/share/debconf/confmodule db_version 2.0 @@ -27,8 +50,6 @@ 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" @@ -44,10 +65,6 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir - # Copy apache.conf file into target directory - #mkdir -p /etc/dolibarr - #cp -p $apachefileorig $apacheconfig - # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -74,21 +91,15 @@ case "$1" in chmod -R 660 $config fi - # Get the web server type (use db_get for interactive mode). - #db_reset "dolibarr/webserver" - #db_get "dolibarr/webserver" # Read value for webserver. - #webserver="$RET" - - case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; - esac - + + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + # Set up web server. - for server in $webservers ; do - echo Complete config of server $server + for webserver in $webservers ; do + webserver=${webserver%,} + echo Complete config of server $webserver # Detect webuser and webgroup webuser= @@ -106,26 +117,31 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config - - # Add link to config file - echo Setup web server $server to add dolibarr config file - ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf - done - # Restart servers - servers="apache2-ssl apache2 mysql" - # Another way to restart - for server in $servers ; do - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $server reload || true - else - echo Restart web server $server using $server reload - /etc/init.d/$server reload || true - fi + # Restart web server. + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_install + else + apache_install $webserver + fi + # Reload webserver in any case, configuration might have changed + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $webserver reload 3>/dev/null || true + else + echo Restart web server $server using $server reload + /etc/init.d/$webserver reload 3>/dev/null || true + fi + fi done + echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -136,13 +152,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument $1" >&2 exit 0 ;; esac -db_stop - #DEBHELPER# +db_stop + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 9eae81b022b..27ce3777b7e 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,7 +17,36 @@ set -e # for details, see /usr/share/doc/packaging-manual/ -. /usr/share/debconf/confmodule + +lighttpd_remove() { + if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + echo "Remove link for Lighttpd config file" + rm -f /etc/lighttpd/conf-available/50-dolibarr.conf + if which lighty-enable-mod >/dev/null 2>&1 ; then + lighty-disable-mod dolibarr + else + echo "Lighttpd not installed, skipping" + fi + # See bug #448682 + if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then + echo 'Manually deleting lighttpd/dolibarr configuration link' + rm /etc/lighttpd/conf-enabled/50-dolibarr.conf + fi + fi +} + +apache_remove() { + if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Remove link for Apache config file" + rm -f /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi db_version 2.0 @@ -26,63 +55,62 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' -apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" -apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" -export webserver="" -# Allows us to loop and substitute in one pass -case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; -esac - case "$1" in # Call when we upgrade upgrade) + echo "postrm upgrade" ;; # Call when we uninstall remove) + echo "postrm remove" rm -f $lockfile - # 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" + # Reconfigure web server + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + + # Restart web servers + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_remove + else + apache_remove $webserver + fi + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload 3>/dev/null || true + else + /etc/init.d/$webserver reload 3>/dev/null || true + fi fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" + echo "postrm purge" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical "dolibarr/postrm" || true + db_input critical dolibarr/postrm || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get "dolibarr/postrm" + db_get dolibarr/postrm set -e if [ "$RET" = "true" ] ; then @@ -185,41 +213,12 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi - # Remove include files - export restart="" - for server in $webservers ; do - export conffile="/etc/$server/conf.d/dolibarr.conf" - if [ -f $conffile ] ; - then - echo Delete file $conffile - rm -f $conffile - status=purge - fi - - if [ "x$status" = "xpurge" ] ; - then restart="$restart $server" - fi - done - rm -rf /etc/dolibarr - # Restart servers - for server in $restart ; do - # We disable blocking errors - set +e - echo "Restart server $server if exists" - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $server reload || true - else - /etc/init.d/$server reload || true - fi - # We restore blocking errors - set -e - done - # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset "dolibarr/postrm" + db_reset dolibarr/reconfigure-webserver + db_reset dolibarr/postrm set -e #db_purge @@ -229,7 +228,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "postrm called with unknown argument $1" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index 5c06afd8ccd..b96325a4e64 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,3 +1,10 @@ +Template: dolibarr/reconfigure-webserver +Type: multiselect +Choices: apache2, lighttpd +_Description: Web server to reconfigure automatically: + Please choose the web server that should be automatically configured + to run dolibarr. + Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index d3c47e6b28d..f1527da165b 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.130 2011/08/03 00:47:37 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -306,18 +306,23 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; - #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; - #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; } # Build package for each target @@ -440,57 +445,61 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$FILENAMETGZ2"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; + print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n"; + $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\""; $ret=`$cmd`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; # Apache conf files - #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; - #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + $ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`; # Dolibarr conf files # TODO @@ -515,21 +524,21 @@ if ($nboftargetok) { $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; # Build tgz @@ -566,9 +575,11 @@ if ($nboftargetok) { next; } - + if ($target eq 'DEB') { + $olddir=getcwd(); + $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -603,7 +614,7 @@ if ($nboftargetok) { $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; - open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; + open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -657,6 +668,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`; @@ -671,19 +683,22 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache conf files + # Apache and lighttpd conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - - # Dolibarr conf files - # TODO + print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -729,17 +744,15 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - print "Go to directory $BUILDROOT\n"; - $olddir=getcwd(); - chdir("$BUILDROOT"); - - # Creation of binary package (to build without sources) + # Creation of binary package (to build without sources) + #print "Go to directory $BUILDROOT\n"; + #chdir("$BUILDROOT"); #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Creation of source package + # Prepare source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -751,6 +764,7 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; + $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -766,6 +780,9 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; + + # Creation of source package + print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/build/rpm/README b/build/rpm/README index 99a1bb3552c..f20bf91db72 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -5,17 +5,24 @@ RPM Package tools This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, -with format RPM (for Redhat, Mandriva, ...). +with format RPM (for Redhat, OpenSuse, Mandriva, ...). -# This is standard command to work on Debian packaging: +# This is standard command to work on RPM packaging: +# +# yum -y install rpmlint +# yum -y install hunspell-en hunspell-es hunspell-fr hunspell-it # # rpmlint file.rpm Test a package +# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm # # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies -# yum erase dolibarr To remove package +# yum erase dolibarr To remove package +# chcon -R -h -t httpd_sys_script_rw_t /file To add temporary context rw for httpd on /file +# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" To add persistent context rw for httpd on /dir (this add file_contexts.local) +# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage) # # On OpenSuse # yast --install dolibarr-...rpm To install package and dependencies diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index 4b4fb60dadb..337b92d8049 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -4,13 +4,14 @@ Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti -Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 708546cf263..08fe933d774 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -5,6 +5,11 @@ # file to build a package for your own distributions and # edit it if you need to match your rules. # -------------------------------------------------------- + +#%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0) +#%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) +#%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0) + %define name dolibarr %define version __VERSION__ %define release __RELEASE__ @@ -12,9 +17,12 @@ Name: %{name} Version: %{version} Release: %{release} -Summary: Dolibarr +Summary: ERP and CRM software for small and medium companies or foundations +Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos +Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations +Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti -License: GPL +License: GPLv2+ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team @@ -56,13 +64,12 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Un software ERP y CRM open source/gratis para pequeñas y -medianas empresas, asociaciones o autónomos. Incluye diferentes -funcionalidades para la Planificación de Recursos Empresariales (ERP) y -Gestión de la Relación con los Clientes (CRM) así como para para otras -diferentes actividades. Dolibarr ha sido diseñado para suministrarle -solamente las funcionalidades que necesita y haciendo hincapié en su -facilidad de uso. +Un software ERP y CRM para pequeñas y medianas empresas, asociaciones +o autónomos. Incluye diferentes funcionalidades para la Planificación +de Recursos Empresariales (ERP) y Gestión de la Relación con los +Clientes (CRM) así como para para otras diferentes actividades. +Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades +que necesita y haciendo hincapié en su facilidad de uso. %description -l fr Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, @@ -71,12 +78,12 @@ fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Un programma gestionale open source e gratuito per piccole e medie +Un programmo gestionale per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori -attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno +attività. Progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. -Dolibar è completamente web-based, progettato per poter fornire solo ciò di +Programmo web, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. @@ -94,49 +101,51 @@ echo Building %{name}-%{version}-%{release} #---- install %install -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr +%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf +%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr # %{_datadir} = /usr/share -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +%{__install} -m 644 var/www/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications +%{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README -install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/doc $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/htdocs $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT #---- clean %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT #---- files %files + %defattr(-,root,root) -%doc README -%doc COPYRIGHT %doc /var/www/dolibarr/doc/* %dir /var/www/dolibarr/build %dir /var/www/dolibarr/htdocs %dir /var/www/dolibarr/scripts -%_datadir/pixmaps/* +%_datadir/pixmaps/dolibarr.png %_datadir/applications/%{name}.desktop /var/www/dolibarr/build/* /var/www/dolibarr/htdocs/* /var/www/dolibarr/scripts/* -/var/www/dolibarr/README -/var/www/dolibarr/COPYRIGHT -#%config /var/www/dolibarr/htdocs/conf/conf.php + +%defattr(0664, -, -, 0755) +%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf +%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr #---- post (after unzip during install) @@ -154,11 +163,11 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr" +export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="/usr/share/dolibarr/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="/usr/share/dolibarr/install.lock" # Detect OS @@ -192,8 +201,8 @@ echo OS detected: $os # Create empty directory for uploaded files and generated documents echo Create document directory $docdir -mkdir -p $docdir -mkdir -p %{_sysconfdir}/dolibarr +%{__mkdir} -p $docdir +%{__mkdir} -p %{_sysconfdir}/dolibarr # Create install.forced.php into Dolibarr install directory superuserlogin='' @@ -205,12 +214,12 @@ if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then fi echo Mysql superuser found to use is $superuserlogin if [ -z "$superuserlogin" ] ; then - cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig + %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig else - cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig + %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig fi -chown -R root:$apachegroup $installconfig -chmod -R 660 $installconfig +%{__chown} -R root:$apachegroup $installconfig +%{__chmod} -R 660 $installconfig # Create an empty conf.php with permission to web server if [ ! -f $config ] @@ -222,19 +231,20 @@ then fi # Create config file for apache $apacheconfig -if [ ! -f $apacheconfig ]; then - echo Create dolibarr web server config file $apacheconfig - cp $apachefileorig $apacheconfig - chmod a-x $apacheconfig - chmod go-w $apacheconfig -fi - -# Create config file for se $seconfig -if [ ! -f $seconfig ]; then - echo Create se config file $seconfig - cp $sefileorig $seconfig +#if [ ! -f $apacheconfig ]; then +# echo Create dolibarr web server config file $apacheconfig +# cp $apachefileorig $apacheconfig # chmod a-x $apacheconfig # chmod go-w $apacheconfig +#fi + +# Create config file for se $seconfig +if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then + echo Add SE Linux permission from file $sefileorig +# cp $sefileorig $seconfig + restorecon -R -v /etc/dolibarr + restorecon -R -v /var/www/dolibarr + restorecon -R -v /usr/share/dolibarr fi # Create a config link dolibarr.conf @@ -253,18 +263,6 @@ echo Set permission to $apacheuser:$apachegroup on $docdir chown -R $apacheuser:$apachegroup $docdir chmod -R o-w $docdir -# Set SE Linux on OS SE is enabled -if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then - echo Set SELinux permissions - # Warning: chcon seems not cumulative - #chcon -R -h -t httpd_sys_content_t $targetdir - #chcon -R -h -t httpd_sys_content_t $docdir - chcon -R -h -t httpd_sys_script_rw_t $targetdir - chcon -R -h -t httpd_sys_script_rw_t $docdir - chcon -R -h -t httpd_sys_script_rw_t %{_sysconfdir}/dolibarr - #chcon -R -h -t httpd_sys_script_exec_t $targetdir -fi - # Restart web server echo Restart web server if [ -f %{_sysconfdir}/init.d/httpd ]; then @@ -274,6 +272,12 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then %{_sysconfdir}/init.d/apache2 restart fi +# Restart mysql +echo Restart mysql +if [ -f /etc/init.d/mysqld ]; then + /etc/init.d/mysqld restart +fi + # Show result echo echo "----- Dolibarr %version - (c) Dolibarr dev team -----" @@ -301,9 +305,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="$targetdir/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="$targetdir/install.lock" # Detect OS @@ -338,7 +342,7 @@ echo OS detected: $os if [ -f $apachelink ] ; then echo Delete apache config link for Dolibarr - rm -f $apachelink + %{__rm} -f $apachelink status=purge fi @@ -356,18 +360,15 @@ then fi # Removed dirs after apache restart -echo Removed remaining $apacheconfig -rm -f $apacheconfig echo Removed remaining $config -rm -f $config +%{__rm} -f $config echo Removed remaining $installconfig -rm -f $installconfig +%{__rm} -f $installconfig echo Removed remaining $lockfile -rm -f $lockfile +%{__rm} -f $lockfile echo Removed remaining dir $targetdir/doc rmdir $targetdir/doc >/dev/null 2>&1 -#echo Removed remaining dir $targetdir/htdocs -#rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm + %changelog * Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 diff --git a/build/rpm/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr index 64376e5afb6..193a43b7dbe 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -1,3 +1,3 @@ -/etc/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/var/www/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file +/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/var/www/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 3cc548e1c0a..d7172d651f0 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -27,7 +27,7 @@ * \file htdocs/includes/modules/modMyModule.class.php * \ingroup mymodule * \brief Description and activation file for module MyModule - * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $ + * \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); @@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='generic'; - // Defined if the directory /mymodule/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 718c842d046..34e7f48cea8 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -20,7 +20,7 @@ /** * \file htdocs/admin/boxes.php * \brief Page to setup boxes - * \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $ */ require("../main.inc.php"); @@ -278,7 +278,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -394,7 +394,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -470,5 +470,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $'); +llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $'); ?> diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index a907f47663a..671bd69a0e4 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2010 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ /** * \file htdocs/admin/modules.php * \brief Page to activate/disable all modules - * \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $ */ require("../main.inc.php"); @@ -79,12 +79,35 @@ $modules = array(); $orders = array(); $categ = array(); $dirmod = array(); +$modulesdir = array(); $i = 0; // is a sequencer of modules found $j = 0; // j is module number. Automatically affected if module number not defined. -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $althandle=@opendir($dirroot); + if (is_resource($althandle)) + { + while (($file = readdir($althandle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
          "; dol_syslog("Scan directory ".$dir." for modules"); @@ -449,5 +472,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $'); +llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $'); ?> diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index bee00b52906..6af9b54e7f0 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -21,7 +21,7 @@ * \file htdocs/admin/perms.php * \ingroup core * \brief Page d'administration/configuration des permissions par defaut - * \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $ + * \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $ */ require("../main.inc.php"); @@ -76,10 +76,34 @@ $db->begin(); // Charge les modules soumis a permissions $modules = array(); -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +$modulesdir = array(); +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
          "; $handle=@opendir($dir); @@ -194,5 +218,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $'); +llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $'); ?> diff --git a/htdocs/boxes.php b/htdocs/boxes.php index 2affdf654d3..d426e618377 100644 --- a/htdocs/boxes.php +++ b/htdocs/boxes.php @@ -22,7 +22,7 @@ * \brief File of class to manage widget boxes * \author Rodolphe Qiedeville * \author Laurent Destailleur - * \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $ */ @@ -220,7 +220,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php"); + $sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); } else { @@ -281,7 +281,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 83dac68a99e..8b82c9f8249 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); @@ -63,11 +62,13 @@ $logout=''; print '
            '; +// Link to new sell print '
          • '.$langs->trans("NewSell").'
            • '; - -print '
          • '.$langs->trans("BackOffice").'
            • '; - -print '
          • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' '.$logout.'
            '; +// Open new tab on backoffice (this is not a disconnect from POS) +print '
          • '.$langs->trans("BackOffice").'
            • '; +// Disconnect +print '
          • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom']; +print ' '.$logout.'
            '; print $langs->trans("CashDeskThirdParty").': '.$companyLink.'
            '; /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'
            '; print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'
            '; diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index f3a440b4929..b18bf124ae4 100644 --- a/htdocs/cashdesk/tpl/validation1.tpl.php +++ b/htdocs/cashdesk/tpl/validation1.tpl.php @@ -15,8 +15,7 @@ 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, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with this program. If not, see . -->
            trans("Summary"); ?> @@ -40,9 +39,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ?> trans("TotalTTC"); ?> prix_total_ttc(),'MT').' '.$conf->monnaie; ?> trans("PaymentMode"); ?> - mode_reglement()) - { + { case 'ESP': echo $langs->trans("Cash"); $filtre='courant=2'; @@ -53,7 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 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"); @@ -65,16 +64,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. echo $langs->trans("Reported"); $filtre='courant=1 OR courant=2'; $selected=''; - break; + break; default: $filtre='courant=1 OR courant=2'; $selected=''; } - + ?> - - mode_reglement() == 'DIF' ) { @@ -100,10 +99,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

            - 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/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 259dc4dbce5..96de90124f9 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -48,7 +47,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -67,7 +66,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -78,17 +77,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index e05eaa66ecf..0efb704828f 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ + * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -1032,5 +1031,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index d2f2a7aae7e..5da397b4183 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ + * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ */ require('../main.inc.php'); @@ -673,5 +672,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); +llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index e6559c2ae2e..c5664164e74 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -16,8 +16,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -25,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $ + * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ */ @@ -145,13 +144,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard + $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard + $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/'; } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php index 07fed567b48..c21450bb8cb 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ + * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index cb4a0f7a5cf..e24b3c7c717 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -23,15 +23,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $ + * \version $Id: html.form.class.php,v 1.193 2011/07/31 23:45:14 eldy Exp $ */ @@ -161,8 +160,10 @@ class Form $htmltext=str_replace("\n","",$htmltext); $htmltext=str_replace('"',""",$htmltext); - $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip - $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip + else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip + else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag $s=""; if (empty($notabs)) $s.=''; diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 8deeda0fb57..2ca2f82789e 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/interfaces.class.php * \ingroup core * \brief Fichier de la classe de gestion des triggers - * \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $ + * \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $ */ diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index c03b55d2347..97d4d8252d3 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ + * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ */ require_once("../main.inc.php"); @@ -1669,7 +1668,7 @@ print '
            '; $db->close(); -llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); +llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); /* diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php index 42780551928..c7bab37ad4b 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.10 2011/07/31 23:28:10 eldy Exp $ + * \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis 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/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 1; // Data directories to create when module is enabled diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 3724ef23d95..9b19d9793fc 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 20ef1080e85..737e16cc10c 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 5d7fca530f2..c9713870c22 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index d7df4ac6929..e7b45a476f1 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 9a0dd0fcc43..62e0a4a90cf 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 0037190af06..50fa9904890 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ + * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 6d19b01e197..2e0fccb0051 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 3050d37833c..223a2eb6d92 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -75,10 +74,12 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +$lockfile = '../../install.lock'; +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; - +#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here +$lockfile = '../../install.lock'; if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -178,7 +179,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists('../../install.lock')) +if (file_exists($lockfile)) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
            '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index c786f91346c..841136fff8b 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 9d08a56e41c..275298588e2 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 1f046a29bc4..8ea28cbbcc3 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.14 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 9a109ab3fdc..4be9b6b7719 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.16 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index 56ceea3d807..da244f79951 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index 3a248c2f49f..eee5dfa185a 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index dcbaf2faaf4..e3922b97f65 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index 1dd3cb59a62..b7f6c71c87e 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,10 +11,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index 5e93e39d048..f3299990858 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index e3ed8196d17..1f14cc8c142 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 176e5c796e2..5017ce0c60d 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql index ad7c175fcc4..eeb2c376b85 100644 --- a/htdocs/install/mysql/data/llx_c_currencies.sql +++ b/htdocs/install/mysql/data/llx_c_currencies.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_c_currencies.sql,v 1.8 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index db630463dbf..f58db2b32a6 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index c67d263853d..079caa7dde4 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 07fa2abaa83..4bb81528e74 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index e29b3f306f5..720413ac480 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index c7fa6b6dd1f..cb0b557b438 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index 6a597996424..a3a19cc2125 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 78e174b9817..1ec498e6bc2 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a535a5098e..3a17978bb0c 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index f6395abbfcd..96d456312df 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 9c28f697f83..488b0a564eb 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index 988d9c26136..d8701c52c01 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ -- -- @@ -34,4 +33,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2d1a3c62a39..2fd47385a90 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 056dbdbdb6e..788e9e82f39 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_c_tva.sql,v 1.27 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index 4238000eb14..da98640fd25 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 6e596be24e5..789ad16fce2 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index e2faed3cba3..48b77951e1f 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index cf7e9e96275..59bd3d1ef00 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index 655848a50ae..cd2f27a5dca 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 968a131e2bb..42f86f1c447 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 6e6e960072b..685170362fd 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 02ff06ba9f1..921bc569980 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index f22262c9353..d5902b539c7 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index b2cdf08af5f..ddd3d734ff7 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 031bfb614e1..8c5c23bbe62 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index 3aa9555979e..f7b876eed86 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 4703aa32ddd..8d34e2a9c78 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index 69bf706ca68..ad6f448e3dc 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 9156b439833..51d66c04584 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index db64e0cbf9c..7df7f21a3b9 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index a7efcbd0f6d..31676d7d6e2 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index 7e4fa074e71..bc9d9ad0936 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index d23a1367f92..18eed730ab8 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index 2b2db5af657..ade41da746e 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index b5c9175202b..62a88236480 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 6ed1e00dd88..015a9e9b4c0 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index d1279c21eb2..296b49fc93f 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 822a69bc4ec..9cedf70e7ca 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index aba765190ee..55718d8ffb5 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index eded16c49fe..abc9baa2d8c 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index e39fbf71f12..3dd83585bcd 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 3710a87470a..217edcaddbb 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index ad41449f288..5869f24d8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index f6301a24919..5db17f19069 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index cd68a9cdb40..5f66ff625f0 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index 890c7597862..b0546729ef0 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index d67cf7fe4b8..4794113f8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5c06c73c69d..5fc25f57339 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 115bd310d70..5746cce26aa 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index d3c71cc4a70..ba1e56e2b94 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index 10c4cc2d853..de9c23e9c05 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,11 +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, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- --- $Id$ +-- $Id: llx_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index 09365976d78..cce9d04707b 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 463b1235094..93e8e3d99a7 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index c81a2b3e830..b0f31fe7116 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index 821fe3e5c04..cb2251cfaf6 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 9380607010d..8bebcf13116 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index e524d9c937a..b30354cae19 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index 0b0b34390c4..b026a40d762 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 7b5fa661d7d..39d21cee7b9 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 66cd5111325..60af7723f30 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index ebca12ab5da..cb223ae5532 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 3872bedd39d..415b8526793 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index bed4ad41dfc..5c54695f608 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 23cd0f575ed..93ef5d59770 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index f46d2a56c33..7702a8cf21e 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_departements.sql b/htdocs/install/mysql/tables/llx_c_departements.sql index ab0ea5dc0c3..ea1f7543428 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_departements.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ +-- $Id: llx_c_departements.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_c_departements diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 4669de108f4..46a35567e95 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index a6bb8ca70f7..c2c43a3a625 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 5637e5a987d..547500d7f33 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index 884d8274cfd..bf7ed18af80 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index 2b6dea6cbd3..d0dceaf0fe1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 76aecebbb9a..192183be0c1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index 665a210d74b..d6d673962b9 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index 7fcd57e31eb..c8deefef6d7 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index e1cab3b3368..757653f1fc2 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f97e458be6b..f2fb7fda4d3 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 165a8550331..7a228ec1572 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 6efa388ef81..120e27ae77d 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index c8824b2d04e..a5e3fd8721b 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 311183c87f4..418e37a85b1 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 2d00f620e02..1cc5dbfaf0e 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 02052920c8a..84c72e0839b 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 0f608cbc171..8cf0ec900f8 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 75b40946559..2eed307bc54 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql index d9d0f2d1b0c..5ef6fb221e6 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_regions.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ +-- $Id: llx_c_regions.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_c_regions diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index 76caf44356d..c977dd9dd21 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 861671e3607..8307ca88eb6 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 46504e8a1c4..9a7bda88c28 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index dc284fc8cea..725ddbfeb90 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index 4f8736a3a14..a1feeb33f8b 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -13,8 +13,7 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -24,7 +23,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 85ea592d950..1e141b7768a 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 9fad6cc333e..79d54faf623 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index d6bd27758b4..97638937c74 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 40759cdc50b..211af70a854 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 80e73c43399..7c4c534451d 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index 4c466e0c02b..f2330322a5f 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 46a39b3c9e7..8e4492c28a9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 60641bf1876..39be52cf374 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index cfe126b5adf..e93ce9b4354 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index 7e12e06beb7..baa01289b96 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index 83eb804c875..bd19d25f1a5 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index 6236e113766..eb95b9fe66c 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index cf5121c34f9..2c95fde3255 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index cabdcce3a80..d62011351c4 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index ebaf9582414..a07ff049d61 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index fa9a85aac1f..730bc11ac98 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index ec8931763bf..6f129f2feec 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 9c6e2a065f8..731cf8fb0f4 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_commande.sql,v 1.13 2011/07/28 22:22:31 eldy Exp $ +-- $Id: llx_commande.sql,v 1.14 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_commande diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 7958b56f354..172a2432ee1 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ --- Supprimme orphelins pour permettre monte de la cl +-- Supprimme orphelins pour permettre mont�e de la cl� -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index 3ef51d6ae21..f1c8c7ac579 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_commande_fournisseur.sql,v 1.7 2011/07/28 22:22:31 eldy Exp $ +-- $Id: llx_commande_fournisseur.sql,v 1.8 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index 3f848c9ffe2..c13c0aa6019 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index df6d49827f6..f0c65456e5c 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index 9bb45f9d326..be4e60a9a97 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 91914ab66c7..23cfd068495 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b39863cab..d1b18165255 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index e964fbc2f5e..19ec675f973 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a747c714fb3..a53a24d9a66 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 16ecb365d6c..46639ca7c1e 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index bfce896eb19..d1ba0645e05 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index 51234007ee1..b7fc52403af 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index eead2907fa2..4187f526393 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 1c757fa6c86..7b74d8b506d 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ --- Supprimme orhpelins pour permettre monte de la cl +-- Supprimme orhpelins pour permettre mont�e de la cl� -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index 79b52ba399c..f1f4a75b604 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 3757e4522bf..39b89773316 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index f5987250001..98b29b1f715 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 9c4a5e340ab..0eb566317d0 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 906d0a3e2f4..3fb9f7d6d2d 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index 20bb329ff0e..ba595100b5f 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index 2063a310fb8..b71d2697b85 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index a99b42859c7..61d63046fac 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index f0e0a065089..0e20201f4cb 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 06af8a78575..154f0b51006 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1c5d5c30173..1dc4941012a 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index e43f4cb118c..a208aa5fff0 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index e4eb41f3bb4..f60029ee290 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 463675b10b7..2833920b746 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index fc998bd6edb..7987ca819c1 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index 1e9b0495d34..e027d471e23 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ +-- $Id: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index b899c4303e1..8b279dc578b 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 5d6d86617e6..684c5aa5a7c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index 6de1b23eb64..cdccf3eb6ec 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index 04491e0878c..fee45753759 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 575930a728c..9401f679071 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 46b769b8afc..757e8d2b447 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index e1b82141ea1..d0118ebdc6c 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 19824c860de..57d92bc8ce9 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 455916a3010..6f2ddcf56b9 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 94e726796c5..6cf13137710 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index 8dbbb572f29..cee3ace0ec3 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 923c2441987..34d0bbac03b 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index 88cf83a3cc3..ef97e48a251 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index 68e21d26061..b674a0cf11d 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index f289b9cb514..5e3620cba87 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index a2e54d34770..bd3c0c7d780 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index dbeec277f88..1524eb7a77b 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index e3e5900fb74..75a4ce8fd06 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index 0669065b7d3..eafe6bd31e1 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index dcca0174817..6a06c0c70b5 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index 99cf1edd744..d4aa4b26d99 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index 415b44c6a35..b55d734674f 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index ba8b40b3c0a..22a5b9d5c52 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 40e131fefdf..5edbea4808d 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index bc11ca42c8f..5313952606a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index 8d4a4ecdcbf..c210f906b9b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index f43ab1e746a..29598bb4963 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index a52d3ed4a8b..cfaad1061df 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 4e9f0d1da0e..521d666742d 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index c9891219f4f..29af17f7c08 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 6b8f7176dee..917d6fc5cdf 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 399dd175311..87245438b4d 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index c06074d4709..373267c8921 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index 1e3f21d0eb7..b67427b9de8 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 08450aa204f..8f00ee95200 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index 9b0104ccfe5..edc76a392b0 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 0782e089170..302248ae299 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 68b6cd9a315..9c741080a27 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 177be65fb88..4dd0ae15ad4 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index d573c90eb18..ffc0666074d 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index e0b2c2494ad..96f122e59cd 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 92000240642..4beccac04b8 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 6240a2ed5c0..484cebf6a2a 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index e2c4be38a5f..a56201f7dba 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 51e133a86dc..84f6077e5ba 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index aab9c69c1a7..46685416239 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index dc9732c0719..1d41d1ab59e 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index 663adaffe60..d6dd854a240 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 73dc6489461..0b7d6a61f56 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index 0b42446740b..c1ee00edd07 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index 7d728850185..d694d696801 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index d062249c3b8..925ca9eee81 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f33c92ea7fe..f67337de388 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 92f21a35f28..8c8454fbc28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index e62275df23d..6c673570cfc 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 29ad3853f90..9c05ed97a8d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Ocbo +-- Copyright (C) 2005 Marc Barilley / Oc�bo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b9ba378d81f..b127b194fa5 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 8771b0ddda8..5c8ea94ed09 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 8bb011f7280..94ba92d4856 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 1aba5d286d1..4017ae32682 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index e0c4fd61701..2c77ae3447c 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 1e721e86788..52c0a3e2a03 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index d4ea3ad5535..439b2a68098 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index 6f8d6a8cf97..f01b7d02e8e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index 854ec6e826e..bd1e805aed2 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index f1e90520593..bfc2162ceca 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 15d3bda5ba2..784e3d37507 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 66a61851cae..029bc528b6e 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 195d2464738..9c066c54436 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index 44a301a2db7..f4e38524d25 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index 237b5c23030..f03d92ce651 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 3bec7551161..2c9c2d929db 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index 45845593162..d9e9ecd43a7 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql index 612755ce349..f2bb73a1bda 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_product_fournisseur.key.sql,v 1.3 2011/07/29 19:59:33 eldy Exp $ +-- $Id: llx_product_fournisseur.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 672374961d5..01cabfec865 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index d8d9443595d..696cf49c337 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index f21fed4d1af..170bd56f390 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index a501b4db4b6..5a3d71b489a 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index 41a91a9aa5f..d29449c2503 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index e12dbc6fb12..86f114d395b 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index 1a83bee6508..ce320558709 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 93a28593f8e..76f76ff08ed 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index ec2bb01863b..133687c7466 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 552a985abd4..6ccd3aa39fb 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index 63b28ac8410..e24a8918c5b 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index e7ccde53858..26e451271cb 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index a1619df5cb5..40b07d29305 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index 309c60b660f..e21669e63d7 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index c92472f7af5..d094512d975 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index 3fb70995900..a75fb9aa76d 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ +-- $Id: llx_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index e7fc66a0ed6..a0d88737e3f 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 57b252ed2ea..9e28a37d6bb 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index b8453ea821c..376447586c9 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index 00268974476..e7528a03f28 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 16bf4dea7f0..4f994cf57aa 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index eff6387abee..1a7fdfd755f 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index f53599483a4..a618e3d8790 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index b9643f019c3..902f2b4fd5f 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index db4cdd2581c..1f5500e2eb1 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index 6bf45f749f5..c7d84e27326 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 7db41de673c..523eb3b37e0 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index 8dc4636c87e..bf057b4ad75 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index d500fc1b7cb..ade6a40a80d 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index a515ba541bf..bca670bbb98 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index b742b82dafc..7481589df00 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index fff909a0ec8..4adaa1a56ff 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index fb65e9b7e84..16631c76b76 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 332b1305d38..3df14473a7e 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index ca4206eb6fc..c3958313ea3 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 68e1d4f20e9..910d2ab2072 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 8714e7e4a07..5c7f2e9a59c 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index 7d3b0eecd98..cbaadb10091 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index 8bdd7193d1a..e88665b5a34 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 367d45e8525..86916c216a2 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 28b28aeb762..23065b261c8 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ +-- $Id: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index d78db14c30b..3f58eaf698b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 68e46fd120d..18924ff6ac5 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 6acb2db4585..8056a150fc3 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 838f502bfdb..1b5ea5516d4 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index f21099e9c5e..e61985c7dd1 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index f771be5ef5a..7bf81b7fbe9 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 0033bca36bc..1fb0d708dfa 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 8037c9cd7e5..6df43634ec4 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 99234b6660f..7b6cbd91645 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index dca8e80f856..810781ed6d9 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index f3a58aa1433..2e89f083575 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index 98c56c37567..fd656c736ef 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 100d9fe82b0..87f6416c6c5 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ -- ============================================================================ CREATE LANGUAGE plpgsql; 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/lib/admin.lib.php b/htdocs/lib/admin.lib.php index c2d47f668da..4092c55ff2d 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ /** * \file htdocs/lib/admin.lib.php * \brief Library of admin functions - * \version $Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis 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.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $ */ function security_prepare_head() { @@ -615,16 +615,41 @@ function Activate($value,$withdeps=1) // Activate module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } $objMod = new $modName($db); @@ -700,20 +725,46 @@ function UnActivate($value,$requiredby=1) $modName = $value; $ret=''; + $modulesdir=array(); // Desactivation du module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } if ($found) diff --git a/htdocs/lib/ajax.lib.php b/htdocs/lib/ajax.lib.php index 7db1908bc49..55def736688 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ */ diff --git a/htdocs/lib/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 1d5b4951490..eedd6a8841c 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -29,7 +29,7 @@ * \ingroup core * \brief File that defines environment for all Dolibarr process (pages or scripts) * This script reads the conf file, init $lang, $db and and empty $user - * \version $Id: master.inc.php,v 1.351 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ */ @@ -70,14 +70,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root[]=$value; + $conf->file->dol_document_root['alt']=$value; } } diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 1dfd99cc99e..ec5d660daef 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -25,7 +25,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.125 2011/07/31 23:22:57 eldy Exp $ + * \version $Id: soc.php,v 1.126 2011/08/01 00:38:49 eldy Exp $ */ require("../main.inc.php"); @@ -587,7 +587,8 @@ else if ($conf->fournisseur->enabled && (GETPOST("type")=='f' || GETPOST("type")=='')) { $object->fournisseur=1; } if (GETPOST("private")==1) { $object->particulier=1; } - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prenom=$_POST["prenom"]; $object->particulier=$_REQUEST["private"]; $object->prefix_comm=$_POST["prefix_comm"]; @@ -1093,7 +1094,8 @@ else if (! empty($_POST["nom"])) { // We overwrite with values if posted - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prefix_comm=$_POST["prefix_comm"]; $object->client=$_POST["client"]; $object->code_client=$_POST["code_client"]; @@ -1967,5 +1969,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.125 $'); +llxFooter('$Date: 2011/08/01 00:38:49 $ - $Revision: 1.126 $'); ?> \ No newline at end of file diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index e4e52c611b4..9edcafd59c0 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/group/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.39 2011/07/31 23:21:25 eldy Exp $ + * \version $Id: perms.php,v 1.40 2011/08/01 13:15:53 hregis Exp $ */ require("../../main.inc.php"); @@ -93,10 +93,34 @@ if ($_GET["id"]) // Charge les modules soumis a permissions $modules = array(); - foreach ($conf->file->dol_document_root as $dirroot) + $modulesdir = array(); + + foreach ($conf->file->dol_document_root as $type => $dirroot) + { + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } + + foreach ($modulesdir as $dir) { - $dir = $dirroot . "/includes/modules/"; - // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
            "; $handle=@opendir($dir); @@ -292,5 +316,5 @@ if ($_GET["id"]) $db->close(); -llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.39 $'); +llxFooter('$Date: 2011/08/01 13:15:53 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index adb7fa764b6..47710b31d9d 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.56 2011/07/31 23:19:42 eldy Exp $ + * \version $Id: perms.php,v 1.57 2011/08/01 13:15:54 hregis Exp $ */ require("../main.inc.php"); @@ -120,12 +120,34 @@ $db->begin(); // Search all modules with permission and reload permissions def. $modules = array(); +$modulesdir = array(); -$listdir=$conf->file->dol_document_root; -foreach($listdir as $dirroot) +foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir=$dirroot."/includes/modules/"; + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} +foreach($modulesdir as $dir) +{ $handle=opendir($dir); if (is_resource($handle)) { @@ -373,5 +395,5 @@ print '
            '; $db->close(); -llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.56 $'); +llxFooter('$Date: 2011/08/01 13:15:54 $ - $Revision: 1.57 $'); ?> From 97a82148ed32403f216022268b607b8b820cb9cc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:22:37 +0000 Subject: [PATCH 040/118] Fix: Avoid errors into rpm packages From c2ec17bd40524643e33b48e2a3c9113f66d638ba Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 21:24:20 +0000 Subject: [PATCH 041/118] Fix: Avoid errors into rpm packages --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/postinst | 100 +- build/deb/postrm | 119 +- build/makepack-dolibarr.pl | 173 +-- build/rpm/README | 23 +- build/rpm/dolibarr.spec | 166 ++- htdocs/admin/proxy.php | 7 +- htdocs/admin/security_other.php | 7 +- htdocs/admin/system/constall.php | 5 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/tpl/menu.tpl.php | 13 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/journal/sellsjournal.php | 5 +- htdocs/compta/prelevement/create.php | 7 +- htdocs/core/class/conf.class.php | 9 +- htdocs/core/class/cookie.class.php | 5 +- htdocs/filefunc.inc.php | 7 +- htdocs/imports/import.php | 7 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 ++++++++--------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/index.php | 7 +- htdocs/install/check.php | 5 +- htdocs/install/default.css | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 5 +- .../mysql/data/llx_20_c_departements.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../tables/llx_product_fournisseur.key.sql | 5 +- htdocs/langs/es_ES/html/gpl.html | 330 ------ htdocs/langs/nl_BE/html/gpl.txt | 340 ------ htdocs/langs/nl_NL/html/gpl.txt | 339 ------ htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 9 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- .../smartphone/theme/default/default.css.php | 5 +- 55 files changed, 870 insertions(+), 1991 deletions(-) delete mode 100644 htdocs/langs/es_ES/html/gpl.html delete mode 100644 htdocs/langs/nl_BE/html/gpl.txt delete mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index d73d7a99219..edb46ffd5a3 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,13 +22,12 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build binary only package +# dpkg -b To build package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# dpkg-reconfigure -plow package Reconfigure package +# # dpkg -L packagename List content of installed package -# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index 3382966714b..b035f18ae1d 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 + -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/postinst b/build/deb/postinst index e0bba1be4da..ca5fd1645dd 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,5 +1,7 @@ #!/bin/sh # postinst script for dolibarr +# +# see: dh_installdeb(1) set -e @@ -14,31 +16,6 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - - -lighttpd_install() { - if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - if which lighty-enable-mod >/dev/null 2>&1 ; then - echo "Add link for Lighttpd config file" - ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf - # We enabled it - lighty-enable-mod dolibarr fastcgi-php - else - echo "Lighttpd not installed, skipping" - fi - fi -} - -apache_install() { - webserver=$1 - if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Add link for Apache config file" - ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - . /usr/share/debconf/confmodule db_version 2.0 @@ -50,6 +27,8 @@ echo Run the dolibarr postinst script # Define vars docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" installconfig="/etc/dolibarr/install.forced.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php" @@ -65,6 +44,10 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir + # Copy apache.conf file into target directory + #mkdir -p /etc/dolibarr + #cp -p $apachefileorig $apacheconfig + # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -91,15 +74,21 @@ case "$1" in chmod -R 660 $config fi - - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - + # Get the web server type (use db_get for interactive mode). + #db_reset "dolibarr/webserver" + #db_get "dolibarr/webserver" # Read value for webserver. + #webserver="$RET" + + case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; + esac + # Set up web server. - for webserver in $webservers ; do - webserver=${webserver%,} - echo Complete config of server $webserver + for server in $webservers ; do + echo Complete config of server $server # Detect webuser and webgroup webuser= @@ -117,31 +106,26 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config + + # Add link to config file + echo Setup web server $server to add dolibarr config file + ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf + done - # Restart web server. - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_install - else - apache_install $webserver - fi - # Reload webserver in any case, configuration might have changed - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $webserver reload 3>/dev/null || true - else - echo Restart web server $server using $server reload - /etc/init.d/$webserver reload 3>/dev/null || true - fi - fi + # Restart servers + servers="apache2-ssl apache2 mysql" + # Another way to restart + for server in $servers ; do + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $server reload || true + else + echo Restart web server $server using $server reload + /etc/init.d/$server reload || true + fi done - echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -152,13 +136,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument $1" >&2 + echo "postinst called with unknown argument \`$1'" >&2 exit 0 ;; esac -#DEBHELPER# - db_stop +#DEBHELPER# + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 27ce3777b7e..9eae81b022b 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,36 +17,7 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - -lighttpd_remove() { - if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - echo "Remove link for Lighttpd config file" - rm -f /etc/lighttpd/conf-available/50-dolibarr.conf - if which lighty-enable-mod >/dev/null 2>&1 ; then - lighty-disable-mod dolibarr - else - echo "Lighttpd not installed, skipping" - fi - # See bug #448682 - if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then - echo 'Manually deleting lighttpd/dolibarr configuration link' - rm /etc/lighttpd/conf-enabled/50-dolibarr.conf - fi - fi -} - -apache_remove() { - if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Remove link for Apache config file" - rm -f /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule -fi +. /usr/share/debconf/confmodule db_version 2.0 @@ -55,62 +26,63 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" +export webserver="" +# Allows us to loop and substitute in one pass +case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; +esac + case "$1" in # Call when we upgrade upgrade) - echo "postrm upgrade" ;; # Call when we uninstall remove) - echo "postrm remove" rm -f $lockfile - # Reconfigure web server - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - - # Restart web servers - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_remove - else - apache_remove $webserver - fi - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $webserver reload 3>/dev/null || true - else - /etc/init.d/$webserver reload 3>/dev/null || true - fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete link $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge" + echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical dolibarr/postrm || true + db_input critical "dolibarr/postrm" || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get dolibarr/postrm + db_get "dolibarr/postrm" set -e if [ "$RET" = "true" ] ; then @@ -213,12 +185,41 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete file $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" + fi + done + rm -rf /etc/dolibarr + # Restart servers + for server in $restart ; do + # We disable blocking errors + set +e + echo "Restart server $server if exists" + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $server reload || true + else + /etc/init.d/$server reload || true + fi + # We restore blocking errors + set -e + done + # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset dolibarr/reconfigure-webserver - db_reset dolibarr/postrm + db_reset "dolibarr/postrm" set -e #db_purge @@ -228,7 +229,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument $1" >&2 + echo "postrm called with unknown argument \`$1'" >&2 exit 0 ;; esac diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index f1527da165b..ae04a704e10 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.130 2011/08/03 00:47:37 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.127 2011/07/31 18:06:36 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.127 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -254,11 +254,9 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliW*-*`; $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliM*-*`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.changes`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`; @@ -306,23 +304,18 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; + #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; + #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; } # Build package for each target @@ -445,103 +438,23 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$FILENAMETGZ2"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; - print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n"; - $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\""; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; $ret=`$cmd`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/README`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - # To remove once stable - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - - # Apache conf files - print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; - $ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`; - - # Dolibarr conf files - # TODO - - # dolibarr.desktop - #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; - #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; - #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; - - # pixmap - #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; - #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; - #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; - - # Set owners - print "Set owners on files/dir\n"; - $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; - - print "Set permissions on files/dir\n"; - $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; - $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - - # Build tgz print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n"; $ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; @@ -575,11 +488,9 @@ if ($nboftargetok) { next; } - + if ($target eq 'DEB') { - $olddir=getcwd(); - $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -614,7 +525,7 @@ if ($nboftargetok) { $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; - open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error"; + open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -668,7 +579,6 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`; @@ -683,22 +593,19 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache and lighttpd conf files + # Apache conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; + + # Dolibarr conf files + # TODO # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -715,7 +622,17 @@ if ($nboftargetok) { print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`; - # Set owners + #print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n"; + #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`; + + # copyright (to build binary package directly without sources. Useless if we build from sources) + #print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n"; + #$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`; + + # changelog (to build binary package directly without sources. Useless if we build from sources) + #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`; + #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`; + print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`; @@ -744,15 +661,17 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - # Creation of binary package (to build without sources) - #print "Go to directory $BUILDROOT\n"; - #chdir("$BUILDROOT"); + print "Go to directory $BUILDROOT\n"; + $olddir=getcwd(); + chdir("$BUILDROOT"); + + # Creation of binary package (to build without sources) #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Prepare source package + # Creation of source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -764,7 +683,6 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; - $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -780,9 +698,6 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; - - # Creation of source package - print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/build/rpm/README b/build/rpm/README index f20bf91db72..c157a195c03 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -5,24 +5,15 @@ RPM Package tools This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, -with format RPM (for Redhat, OpenSuse, Mandriva, ...). +with format RPM (for Redhat, Mandriva, ...). -# This is standard command to work on RPM packaging: -# -# yum -y install rpmlint -# yum -y install hunspell-en hunspell-es hunspell-fr hunspell-it -# -# rpmlint file.rpm Test a package -# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm +# This is standard command to work on Debian packaging: # # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies -# yum erase dolibarr To remove package -# chcon -R -h -t httpd_sys_script_rw_t /file To add temporary context rw for httpd on /file -# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" To add persistent context rw for httpd on /dir (this add file_contexts.local) -# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage) +# yum erase dolibarr To remove package # # On OpenSuse # yast --install dolibarr-...rpm To install package and dependencies @@ -49,9 +40,7 @@ different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. I am author of other already packaged OpenSources packages (awstats) but this is my first package to maintain myself. So i'm seeking a sponsor. + - Edit field "Block" and add FE-NEEDSPONSOR -- Check bug is into database by searching with id on https://bugzilla.redhat.com/ -- Install fedora packager tools: yum install fedora-packager -- Setup fedora packagers tools: fedora-packager-setup -- Send your package: koji build --scratch f16 path_to_source_RPM -- Check if package is available: http://koji.fedoraproject.org/koji/ \ No newline at end of file + +- Check bug is into database by searching with id on https://bugzilla.redhat.com/ \ No newline at end of file diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 08fe933d774..1754220c6c7 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 @@ -56,7 +48,7 @@ AutoReqProv: no %description -An easy to use CRM & ERP open source/free software for small +Dolibarr ERP & CRM is an easy to use open source/free software for small and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. @@ -64,26 +56,27 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Un software ERP y CRM para pequeñas y medianas empresas, asociaciones -o autónomos. Incluye diferentes funcionalidades para la Planificación -de Recursos Empresariales (ERP) y Gestión de la Relación con los -Clientes (CRM) así como para para otras diferentes actividades. -Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades -que necesita y haciendo hincapié en su facilidad de uso. +Dolibarr ERP y CRM es un software open source/gratis para pequeñas y +medianas empresas, asociaciones o autónomos. Incluye diferentes +funcionalidades para la Planificación de Recursos Empresariales (ERP) y +Gestión de la Relación con los Clientes (CRM) así como para para otras +diferentes actividades. Dolibarr ha sido diseñado para suministrarle +solamente las funcionalidades que necesita y haciendo hincapié en su +facilidad de uso. %description -l fr -Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, +Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, artisans ou associations. Il permet de gérer vos clients, prospect, fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Un programmo gestionale per piccole e medie +Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori -attività. Progettato per poter fornire solo ciò di cui hai bisogno +attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. -Programmo web, progettato per poter fornire solo ciò di +Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. @@ -101,51 +94,48 @@ echo Building %{name}-%{version}-%{release} #---- install %install -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr -%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf -%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr +mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build +mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc +mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs +mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts -# %{_datadir} = /usr/share -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -%{__install} -m 644 var/www/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications -%{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts -%{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr -%{__cp} -pr var/www/dolibarr/doc $RPM_BUILD_ROOT/var/www/dolibarr -%{__cp} -pr var/www/dolibarr/htdocs $RPM_BUILD_ROOT/var/www/dolibarr -%{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr -%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr #---- clean %clean -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT #---- files %files - %defattr(-,root,root) +%doc README +%doc COPYRIGHT %doc /var/www/dolibarr/doc/* %dir /var/www/dolibarr/build %dir /var/www/dolibarr/htdocs %dir /var/www/dolibarr/scripts -%_datadir/pixmaps/dolibarr.png +%_datadir/pixmaps/* %_datadir/applications/%{name}.desktop /var/www/dolibarr/build/* /var/www/dolibarr/htdocs/* /var/www/dolibarr/scripts/* - -%defattr(0664, -, -, 0755) -%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf -%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr +/var/www/dolibarr/README +/var/www/dolibarr/COPYRIGHT +#%config /var/www/dolibarr/htdocs/conf/conf.php #---- post (after unzip during install) @@ -163,11 +153,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" -export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" -#export config="/usr/share/dolibarr/htdocs/conf/conf.php" -export config="%{_sysconfdir}/dolibarr/conf.php" -export lockfile="/usr/share/dolibarr/install.lock" +#config="/usr/share/dolibarr/htdocs/conf/conf.php" +config="%{_sysconfdir}/dolibarr/conf.php" +lockfile="/usr/share/dolibarr/install.lock" # Detect OS @@ -201,8 +189,8 @@ echo OS detected: $os # Create empty directory for uploaded files and generated documents echo Create document directory $docdir -%{__mkdir} -p $docdir -%{__mkdir} -p %{_sysconfdir}/dolibarr +mkdir -p $docdir +mkdir -p %{_sysconfdir}/dolibarr # Create install.forced.php into Dolibarr install directory superuserlogin='' @@ -214,12 +202,12 @@ if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then fi echo Mysql superuser found to use is $superuserlogin if [ -z "$superuserlogin" ] ; then - %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig + cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig else - %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig + cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig fi -%{__chown} -R root:$apachegroup $installconfig -%{__chmod} -R 660 $installconfig +chown -R root:$apachegroup $installconfig +chmod -R 660 $installconfig # Create an empty conf.php with permission to web server if [ ! -f $config ] @@ -230,24 +218,15 @@ then chmod -R 660 $config fi -# Create config file for apache $apacheconfig -#if [ ! -f $apacheconfig ]; then -# echo Create dolibarr web server config file $apacheconfig -# cp $apachefileorig $apacheconfig -# chmod a-x $apacheconfig -# chmod go-w $apacheconfig -#fi - -# Create config file for se $seconfig -if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then - echo Add SE Linux permission from file $sefileorig -# cp $sefileorig $seconfig - restorecon -R -v /etc/dolibarr - restorecon -R -v /var/www/dolibarr - restorecon -R -v /usr/share/dolibarr +# Create a config file $apacheconfig +if [ ! -f $apacheconfig ]; then + echo Create dolibarr web server config file $apacheconfig + cp $apachefileorig $apacheconfig + chmod a-x $apacheconfig + chmod go-w $apacheconfig fi -# Create a config link dolibarr.conf +# Create a config link dolibarr.conf for Fedora or Redhat if [ ! -f $apachelink ]; then echo Create dolibarr web server config link $apachelink ln -fs $apacheconfig $apachelink @@ -263,6 +242,18 @@ echo Set permission to $apacheuser:$apachegroup on $docdir chown -R $apacheuser:$apachegroup $docdir chmod -R o-w $docdir +# Set SE Linux on OS SE is enabled +if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then + echo Set SELinux permissions + # Warning: chcon seems not cumulative + #chcon -R -h -t httpd_sys_content_t $targetdir + #chcon -R -h -t httpd_sys_content_t $docdir + chcon -R -h -t httpd_sys_script_rw_t $targetdir + chcon -R -h -t httpd_sys_script_rw_t $docdir + chcon -R -h -t httpd_sys_script_rw_t %{_sysconfdir}/dolibarr + #chcon -R -h -t httpd_sys_script_exec_t $targetdir +fi + # Restart web server echo Restart web server if [ -f %{_sysconfdir}/init.d/httpd ]; then @@ -272,12 +263,6 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then %{_sysconfdir}/init.d/apache2 restart fi -# Restart mysql -echo Restart mysql -if [ -f /etc/init.d/mysqld ]; then - /etc/init.d/mysqld restart -fi - # Show result echo echo "----- Dolibarr %version - (c) Dolibarr dev team -----" @@ -305,9 +290,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#export config="/usr/share/dolibarr/htdocs/conf/conf.php" -export config="%{_sysconfdir}/dolibarr/conf.php" -export lockfile="$targetdir/install.lock" +#config="/usr/share/dolibarr/htdocs/conf/conf.php" +config="%{_sysconfdir}/dolibarr/conf.php" +lockfile="$targetdir/install.lock" # Detect OS @@ -342,7 +327,7 @@ echo OS detected: $os if [ -f $apachelink ] ; then echo Delete apache config link for Dolibarr - %{__rm} -f $apachelink + rm -f $apachelink status=purge fi @@ -360,16 +345,19 @@ 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 -- Initial version (#723326) +* Wed Jul 31 2011 Laurent Destailleur 3.1.0 +- Initial upstream (#723326) diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 2c284c5cae8..f02e3d6203a 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ + * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -205,5 +206,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c1d629f7b7b..c0aaaa86213 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -347,5 +348,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index f478b65e3a8..a07b28bd2cf 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/system/constall.php * \brief Page to show all Dolibarr setup (config file and database constants) - * \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $ + * \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $ */ require("../../main.inc.php"); diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index c79d46fbeb5..698cceb4966 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,11 +11,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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ -/* \version $Id$ */ +/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index f91946e11c0..2d89cfd2388 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.js @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ // Instanciation et initialisation de l'objet xmlhttprequest 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/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 0c262ba2936..5ba2ef8997e 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -385,5 +386,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 525160df9ef..9ee1f551048 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ + * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -607,5 +608,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index ee18392f767..b2d73348949 100755 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.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., 675 Mass Ave, Cambridge, MA 02139, USA. */ require("../../main.inc.php"); @@ -203,5 +204,5 @@ print ""; // End of page $db->close(); -llxFooter('$Date: 2011/07/31 22:08:25 $ - $Revision: 1.10 $'); +llxFooter('$Date: 2011/07/31 21:26:51 $ - $Revision: 1.9 $'); ?> \ No newline at end of file diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 79d00ae00c7..689e2639773 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ + * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -275,5 +276,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); +llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/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/filefunc.inc.php b/htdocs/filefunc.inc.php index 3148174f5af..13a97bf54b3 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,14 +20,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -64,7 +65,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 97d4d8252d3..c03b55d2347 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ + * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ */ require_once("../main.inc.php"); @@ -1668,7 +1669,7 @@ print '
              '; $db->close(); -llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); +llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); /* diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 257b95e4e3c..6f6c7ed2a1b 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -65,7 +64,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.30 $'); + $ver=explode(' ','$Revision: 1.31 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 127eb16e389..446606ef055 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -64,7 +63,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
              This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.27 $'); + $ver=explode(' ','$Revision: 1.28 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 9c90d1fcc94..46fa4c9ccc4 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,9 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* or see http://www.gnu.org/ +* along with this program. If not, see . */ /** @@ -22,7 +20,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id$ + * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -61,7 +59,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
              This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision$'); + $ver=explode(' ','$Revision: 1.14 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index ec7e1af07c6..7055bef4b69 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index b1e3f5a2638..067e831b0b4 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,504 +1,503 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; If not, see . + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index b1e3f5a2638..e5f0ff4c0e5 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + License along with this library; If not, see . Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/index.php b/htdocs/index.php index f027e94a35a..5998094d362 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -573,7 +574,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); +llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9b19d9793fc..3724ef23d95 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 9978c8f437a..1d2084e7c7f 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: default.css,v 1.24 2011/08/03 01:32:42 eldy Exp $ */ body { diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 737e16cc10c..20ef1080e85 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ + * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index c9713870c22..5d7fca530f2 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index e7b45a476f1..d7df4ac6929 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 62e0a4a90cf..9a0dd0fcc43 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ + * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 50fa9904890..0037190af06 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 2e0fccb0051..6d19b01e197 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ + * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 223a2eb6d92..3050d37833c 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -74,12 +75,10 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -$lockfile = '../../install.lock'; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; -#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here -$lockfile = '../../install.lock'; + if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -179,7 +178,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists($lockfile)) +if (file_exists('../../install.lock')) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
              '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index 841136fff8b..c786f91346c 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ + * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 8ea28cbbcc3..1f046a29bc4 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -18,9 +18,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_10_c_regions.sql,v 1.14 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 4be9b6b7719..9a109ab3fdc 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -18,9 +18,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_20_c_departements.sql,v 1.16 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index e2f225fe608..d1e6b216b4b 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql index f2bb73a1bda..612755ce349 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql @@ -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: llx_product_fournisseur.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id: llx_product_fournisseur.key.sql,v 1.3 2011/07/29 19:59:33 eldy Exp $ -- ============================================================================ diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html deleted file mode 100644 index 38e0f007a15..00000000000 --- a/htdocs/langs/es_ES/html/gpl.html +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - -H. Licencia Pública GNU - - - - - - - - - - - - - -

              Licencia Pública GNU

              - - - - -
              - -GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 - -
              - -

              Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, - MA 02139, USA.

              -

              Está permitido, a cualquier persona, copiar y distribuir copias tal cual de - este documento de licencia, sin la introducción de cualquier cambio. -

              - -
              -

              Introducción

              -

              Las licencias de muchos softwares se desarrollan para asegurar la libertad - de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, - al contrario, pretende garantizar la libertad de compartir y alterar softwares - de libre distribución - volviéndolos de libre distribución también para cualquier - de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares - de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla - (algunos softwares de la FSF son cubiertos por la GNU Library General Public - License).

              -

              Cuando nos referimos a softwares de libre distribución, nos referimos a la - libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar - la libertad de distribución de copias de softwares de libre distribución (y - cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos - fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se - hacen algunas restricciones, para asegurar los derechos de los programadores, - prohibiendo a todas las personas su negación o la solicitación de su abdicación. - Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución - o modificación del software.

              -

              Por ejemplo, al distribuirse copias de determinado programa, por una tasa - determinada o gratuitamente, se debe informar sobre todos los derechos incidentes - sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia - Pública General GNU.

              -

              La protección de los derechos envuelve dos pasos: (1) copyright del software - y (2) licencia que da permiso legal para copia, distribución y/o modificación - del softwares.

              -

              Aún para la protección de la FSF y del autor es importante que todos entiendan - que no hay garantías para softwares de libre distribución. Si software se modifica - por alguien y lo pasa adelante, este software no más reflejará el trabajo original - del autor no pudiendo, por consiguiente, ser garantizado por aquél.

              -

              Finalmente, cualquier programa de libre distribución está constantemente amenazado - por las patentes de softwares. Buscamos evitar el peligro de que distribuidores - de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. - Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación - de patente se debe hacer permitiendo el uso por cualquier individuo, sin la - necesidad de licencia de uso.

              -

              Los términos y condiciones precisas para copia, distribución y modificación - siguen abajo:

              -
              -

              Licencia Pública General GNU

              -

              TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN -

              - -
                - -

              1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga - un aviso colocado por el detentor de los derechos de autor diciendo que aquel - podrá ser distribuido en las condiciones de la Licencia Pública General. El - Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado - en un Programa y significa tanto el propio Programa, como cualquier de los - trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, - un trabajo que contenga el Programa o una parte de este, en su forma original - o con modificaciones o traducido para una otra lengua (la traducción está - incluida sin limitaciones en el término ``modificación'').

                -

                Actividades distintas de copia, distribución y modificación no están cubiertas - por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa - no está restringido y la salida del Programa está cubierta solamente en - el caso de que su contenido contenga trabajos basados en el Programa (independientemente - de que hayan sido creados por la ejecución del Programa). Si esto es así, - depende de las funciones ejecutadas por el Programa.

                2. - -

              2. El código fuente del Programa, de la forma como fue recibido, puede ser - copiado y distribuido, en cualquier media, desde que sea providenciado un - aviso adecuado sobre los copyrights y la negación de garantías, y todos los - avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, - estén inalterados y que cualquier producto oriundo del Programa esté acompañado - de esta Licencia Pública General.

                -

                Está permitido el cobro de tasas por el acto físico de transferencia o - grabación de copias, y pueden ser dadas garantías y soporte en cambio del - cobro de valores.

                3. - - -
              3. -

                Se puede modificar la copia o copias del Programa de cualquier forma que - se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir - tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                - -
                  -

                1. Debe existir un aviso destacado de que los datos originales fueron alterados - en los archivos y las fechas de los cambios;

                  2. - -

                2. Debe existir un aviso de que el trabajo distribuido o publicado es, - de forma total o parcial, derivado del Programa o de alguna parte suya, - y que puede ser licenciado totalmente sin costes para terceros bajo los - términos de esta Licencia.

                  3. - -

                3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, - en el inicio de tu ejecución, presentar la información de copyright y - de ausencia de garantías (o de que la garantía es de responsabilidad de - terceros), y que los usuarios pueden redistribuir el programa bajo estas - condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                  4. -
                - - Estos requisitos se aplican a trabajos de modificación en general. Si - algunas secciones identificables no sean derivadas del Programa, y pueden - ser consideradas como partes independientes, entonces esta Licencia y sus - Términos no se aplican a aquellas secciones cuando distribuidas separadamente. - Pero al distribuir aquellas secciones como parte de un trabajo basado en - el Programa, la distribución, como un todo, debe contener los términos de - esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no - a cada una de las partes independientemente de quem los tenga desarrollado. - Más que tener intención de contestar los derechos sobre el trabajo desarrollado - por alguien, esta sección objetiva propiciar la correcta distribución de - trabajos derivados del Programa. - Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado - en él ni a un trabajo basado en él, a un volumen de almacenaje o media de - distribución no obliga la utilización de esta Licencia y de sus términos - al trabajo. -
                4. - - -
              4. -

                Están permitidas, la copia y la distribución, del Programa (o un trabajo - basado en éste) en la forma de código objeto o ejecutable de acuerdo con los - términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                - -
                  -

                1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos - en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada - para manejo de softwares o

                  -
                  2. -

                2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, - de poner a disposición a terceros, por un coste no superior al coste del - medio físico de almacenaje, una copia completa de los códigos fuente en - medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                  -
                  3. -

                3. Esté acompañada con la misma información recibida en relación con la - oferta de la distribución del código fuente correspondiente (esta alternativa - solamente está permitida para distribuciones no comerciales y solamente - si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, - de acuerdo con la sección 2 arriba).

                  -
                  4. -
                - El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones - en aquel trabajo. Cuando se habla en códigos fuentes completos significa - hablar de todos los fuentes de todos los módulos, además de las definiciones - de interfaces asociadas, archivos, scripts utilizados en la compilación - y instalación del ejecutable. Como una excepción excepcional, el código - fuente distribuido podrá no incluir algunos componentes que no se encuentren - en su escopo, como compilador, kernel, etc... para el SO donde el trabajo - sea ejecutado. - Si la distribución del ejecutable o objeto se hace, a través de acceso - a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente - de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos - con los objetos simultáneamente -
                5. - -
              5. -

                No está permitida la copia, modificación, sublicenciamiento o distribución - del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier - tentativa de copia, modificación, sublicenciamiento o distribución del Programa - está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. - Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, - no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas - de esta Licencia.

                6. -
              6. -

                No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá - documento o contrato que garantice permiso de modificación o distribución - del Programa o sus trabajos derivados. Estas acciones están prohibidas por - ley, en el caso de que no se acepten las condiciones de esta Licencia. La - modificación o distribución del Programa, o cualquier trabajo basado en éste, - implica en la aceptación de esta Licencia y de todos los términos de ésta - para copia, distribución o modificación del Programa o trabajos basados en - éste.

                7. -
              7. -

                Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), - el recipiente automáticamente recibe una licencia del detentor original de - los derechos de copia, distribución o modificación del Programa objeto de - estos términos y condiciones. No pueden ser impuestas otras restricciones - en los recipientes.

                8. - -
              8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes - o derechos de autor, se impongan restricciones, que contradigan esta Licencia, - estos no exentan de su aplicación. Si no es posible distribuir el Programa - de forma a garantizar simultáneamente las obligaciones de esta Licencia y - otras que sean necesarias, entonces el Programa no podrá ser distribuido. -

                Si esta Sección se considera, inválida por cualquier motivo particular - o general, su resultado implicará en la invalidación general de esta licencia - en la copia, modificación, sublicenciamiento o distribución del Programa - o trabajos basados en éste.

                -

                El propósito de esta sección no es, de forma alguna, incitar a quien quiera - que sea a infringir derechos reclamados en cuestiones válidas y procedentes, - y si proteger las premisas del sistema de libre distribución de software. - Muchas personas tienen hecho contribuciones generosas al sistema, en la - forma de programas, y es necesario garantizar la consistencia y credibilidad - del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución - de los softwares.

                -

                Esta sección pretende hacer claro los motivos que crearan las demás cláusulas - de estas Licencia.

                9. - -
              9. -

                Si la distribución del Programa, dentro de los términos de esta Licencia, - tiene restricciones en algún País, por patentes o derechos de autor, el detentor - original de los derechos de autor del Programa bajo esta Licencia puede adicionar - explícitamente limitaciones geográficas de distribución, excluyendo aquellos - Países, haciendo con que la distribución solamente sea posible en los Países - no excluidos.

                10. - -
              10. -

                La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) - puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública - General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos - objetivos y el espirito de la presente versión, pudiendo variar en detalles - referentes a nuevas situaciones encontradas.

                -

                A cada versión se da un número distinto. Si el Programa especifica, un - número de versión determinado de esta Licencia, que tenga en su contenido - la expresión ``o versión más actualizada'', es posible optar por las condiciones - de aquella versión o de cualquier versión más actualizada publicada por - la FSF.

                11. - -
              11. -

                Si deseas incorporar parte del Programa en otros programas de libre distribución - de softwares hace falta autorización formal del autor. Para softwares que - la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde - que mantenido el espirito y objetivos originales de esta Licencia.

                12. -
              - -

              AUSENCIA DE GARANTÍAS

              -
                -

              1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER - GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE - EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS - DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, - LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD - Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS - CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y - REPAROS JUZGADOS NECESARIOS.

                2. -

              2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR - LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN - RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE - HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS - O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES - O DAÑOS.

                -

                FIN DE LA LICENCIA

              - - -
              -

               

              -

              Apéndice

              -

              ¿Cómo aplicar estos términos a nuevos softwares?

              -

              Si has desarrollado un nuevo programa y deseas su amplia distribución para - el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, - que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

              -

              Para esto basta con anexar este aviso al programa. Se recomienda indicar aún - en el inicio de cada archivo fuente la ausencia de garantías y una anotación - de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

              -

              <nombre del programa y función> Copyright (C) 199X <Autor> -

              -

              Este programa es un software de libre distribución, que puede ser copiado - y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo - con la publicada por la Free Software Foundation, versión 2 de la licencia o - (a criterio del autor) cualquier versión posterior.

              -

              Este programa se distribuye en la expectativa de ser útil a sus usuarios, - pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE - ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General - 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. -

              -

              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:

              -

              Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares - NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software - de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. - Teclea 'muestra condic' para mayores detalles.

              -

              Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las - partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos - pueden variar o pueden ser accionados por otras interfaces como clic de ratón, - etc...

              -

               

              -
              -
              - -www.conectiva.com - -
              - - - - - diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt deleted file mode 100644 index 3efbe1ccee7..00000000000 --- a/htdocs/langs/nl_BE/html/gpl.txt +++ /dev/null @@ -1,340 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -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 deleted file mode 100644 index 778e2b02b41..00000000000 --- a/htdocs/langs/nl_NL/html/gpl.txt +++ /dev/null @@ -1,339 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van -deze licentie. \ No newline at end of file diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1bdeb9562e6..49b67f9349a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index eedd6a8841c..03ef2767e40 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -21,7 +21,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -29,7 +30,7 @@ * \ingroup core * \brief File that defines environment for all Dolibarr process (pages or scripts) * This script reads the conf file, init $lang, $db and and empty $user - * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ + * \version $Id: master.inc.php,v 1.350 2011/07/30 10:23:24 eldy Exp $ */ @@ -70,14 +71,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root['alt']=$value; + $conf->file->dol_document_root[]=$value; } } diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index 454073d9730..d6bf7267439 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index b5304ba4198..6e1e7b262f4 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index bda35165079..b0a7c2dece6 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id$ + * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ */ if (session_id() == "") session_start(); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 8bccf934120..1da2adb751e 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ + * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index efbd289cb3f..a65f888ab11 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ + * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ */ require("../main.inc.php"); @@ -1645,6 +1646,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 8f373b577e8..79601ea1031 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 724900dc500..8cf57ec0b64 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ + * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ */ require("../main.inc.php"); @@ -271,5 +272,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); +llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); ?> diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index f93935ffb16..e78dff8f646 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id$ + * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal From 171eb8ddfc0233807a09cd3c9f97034e8991260d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 22:08:12 +0000 Subject: [PATCH 042/118] Work on 3.1 packaging --- build/makepack-dolibarr.pl | 116 ++++++++++++++++++++++++------- build/rpm/README | 10 ++- build/rpm/dolibarr.desktop | 3 +- build/rpm/dolibarr.spec | 27 ++++--- build/rpm/file_contexts.dolibarr | 6 +- 5 files changed, 122 insertions(+), 40 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index ae04a704e10..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.127 2011/07/31 18:06:36 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.127 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -254,9 +254,11 @@ 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`; @@ -444,17 +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/$PROJECT.tmp/$PROJECT/README`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + # To remove once stable + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + + # Apache conf files + #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + + # Dolibarr conf files + # TODO + + # dolibarr.desktop + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; + #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; + #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; + + # pixmap + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; + #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; + #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; + + # Set owners + print "Set owners on files/dir\n"; + $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; + + print "Set permissions on files/dir\n"; + $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; + $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + + # Build tgz print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n"; $ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; @@ -622,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`; diff --git a/build/rpm/README b/build/rpm/README index c157a195c03..99a1bb3552c 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -10,6 +10,8 @@ with format RPM (for Redhat, Mandriva, ...). # This is standard command to work on Debian packaging: # +# rpmlint file.rpm Test a package +# # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies @@ -40,7 +42,9 @@ different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. I am author of other already packaged OpenSources packages (awstats) but this is my first package to maintain myself. So i'm seeking a sponsor. - - Edit field "Block" and add FE-NEEDSPONSOR - -- Check bug is into database by searching with id on https://bugzilla.redhat.com/ \ No newline at end of file +- Check bug is into database by searching with id on https://bugzilla.redhat.com/ +- Install fedora packager tools: yum install fedora-packager +- Setup fedora packagers tools: fedora-packager-setup +- Send your package: koji build --scratch f16 path_to_source_RPM +- Check if package is available: http://koji.fedoraproject.org/koji/ \ No newline at end of file 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 1754220c6c7..708546cf263 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -48,7 +48,7 @@ AutoReqProv: no %description -Dolibarr ERP & CRM is an easy to use open source/free software for small +An easy to use CRM & ERP open source/free software for small and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. @@ -56,7 +56,7 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Dolibarr ERP y CRM es un software open source/gratis para pequeñas y +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 @@ -65,13 +65,13 @@ solamente las funcionalidades que necesita y haciendo hincapié en su facilidad de uso. %description -l fr -Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, +Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, artisans ou associations. Il permet de gérer vos clients, prospect, fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Dolibarr è un programma gestionale open source e gratuito 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à. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno @@ -101,6 +101,7 @@ 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 cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -153,6 +154,8 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" +export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr" +export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="%{_sysconfdir}/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" @@ -218,7 +221,7 @@ then chmod -R 660 $config fi -# Create a config file $apacheconfig +# Create config file for apache $apacheconfig if [ ! -f $apacheconfig ]; then echo Create dolibarr web server config file $apacheconfig cp $apachefileorig $apacheconfig @@ -226,7 +229,15 @@ if [ ! -f $apacheconfig ]; then chmod go-w $apacheconfig fi -# Create a config link dolibarr.conf for Fedora or Redhat +# Create config file for se $seconfig +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 if [ ! -f $apachelink ]; then echo Create dolibarr web server config link $apachelink ln -fs $apacheconfig $apachelink @@ -359,5 +370,5 @@ rmdir $targetdir/doc >/dev/null 2>&1 #rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm %changelog -* Wed Jul 31 2011 Laurent Destailleur 3.1.0 -- Initial upstream (#723326) +* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 +- Initial version (#723326) diff --git a/build/rpm/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr index 193a43b7dbe..64376e5afb6 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -1,3 +1,3 @@ -/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 -/var/www/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 -/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file +/etc/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 +/var/www/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 +/usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file From 723295fc6a1d3aa9cc1a035bedeff80d71ba6f81 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 22:08:25 +0000 Subject: [PATCH 043/118] Fix: Avoid errors into rpm packages --- htdocs/compta/journal/sellsjournal.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index b2d73348949..ee18392f767 100755 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.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., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program. If not, see . */ require("../../main.inc.php"); @@ -204,5 +203,5 @@ print ""; // End of page $db->close(); -llxFooter('$Date: 2011/07/31 21:26:51 $ - $Revision: 1.9 $'); +llxFooter('$Date: 2011/07/31 22:08:25 $ - $Revision: 1.10 $'); ?> \ No newline at end of file From e31c929ca5171107ede9a91336da1e47024f763e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:32:42 +0000 Subject: [PATCH 044/118] Fix: Avoid errors into rpm packages --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/postinst | 100 +++--- build/deb/postrm | 119 +++--- build/makepack-dolibarr.pl | 163 +++++---- build/rpm/README | 13 +- build/rpm/dolibarr.desktop | 3 +- build/rpm/dolibarr.spec | 157 ++++---- build/rpm/file_contexts.dolibarr | 6 +- htdocs/admin/proxy.php | 7 +- htdocs/admin/security_other.php | 7 +- htdocs/admin/system/constall.php | 5 +- htdocs/cashdesk/tpl/menu.tpl.php | 13 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/prelevement/create.php | 7 +- htdocs/core/class/conf.class.php | 9 +- htdocs/core/class/cookie.class.php | 5 +- htdocs/filefunc.inc.php | 7 +- htdocs/imports/import.php | 7 +- htdocs/index.php | 7 +- htdocs/install/check.php | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 5 +- .../mysql/data/llx_20_c_departements.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../tables/llx_product_fournisseur.key.sql | 5 +- htdocs/langs/es_ES/html/gpl.html | 329 +++++++++++++++++ htdocs/langs/nl_BE/html/gpl.txt | 338 +++++++++++++++++ htdocs/langs/nl_NL/html/gpl.txt | 339 ++++++++++++++++++ htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 9 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- 43 files changed, 1398 insertions(+), 375 deletions(-) create mode 100644 htdocs/langs/es_ES/html/gpl.html create mode 100644 htdocs/langs/nl_BE/html/gpl.txt create mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index edb46ffd5a3..d73d7a99219 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build package +# dpkg -b To build binary only package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# +# dpkg-reconfigure -plow package Reconfigure package # dpkg -L packagename List content of installed package +# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index b035f18ae1d..3382966714b 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 + -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/postinst b/build/deb/postinst index ca5fd1645dd..e0bba1be4da 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,7 +1,5 @@ #!/bin/sh # postinst script for dolibarr -# -# see: dh_installdeb(1) set -e @@ -16,6 +14,31 @@ set -e # for details, see /usr/share/doc/packaging-manual/ + + +lighttpd_install() { + if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + if which lighty-enable-mod >/dev/null 2>&1 ; then + echo "Add link for Lighttpd config file" + ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf + # We enabled it + lighty-enable-mod dolibarr fastcgi-php + else + echo "Lighttpd not installed, skipping" + fi + fi +} + +apache_install() { + webserver=$1 + if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Add link for Apache config file" + ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + . /usr/share/debconf/confmodule db_version 2.0 @@ -27,8 +50,6 @@ 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" @@ -44,10 +65,6 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir - # Copy apache.conf file into target directory - #mkdir -p /etc/dolibarr - #cp -p $apachefileorig $apacheconfig - # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -74,21 +91,15 @@ case "$1" in chmod -R 660 $config fi - # Get the web server type (use db_get for interactive mode). - #db_reset "dolibarr/webserver" - #db_get "dolibarr/webserver" # Read value for webserver. - #webserver="$RET" - - case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; - esac - + + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + # Set up web server. - for server in $webservers ; do - echo Complete config of server $server + for webserver in $webservers ; do + webserver=${webserver%,} + echo Complete config of server $webserver # Detect webuser and webgroup webuser= @@ -106,26 +117,31 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config - - # Add link to config file - echo Setup web server $server to add dolibarr config file - ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf - done - # Restart servers - servers="apache2-ssl apache2 mysql" - # Another way to restart - for server in $servers ; do - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $server reload || true - else - echo Restart web server $server using $server reload - /etc/init.d/$server reload || true - fi + # Restart web server. + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_install + else + apache_install $webserver + fi + # Reload webserver in any case, configuration might have changed + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $webserver reload 3>/dev/null || true + else + echo Restart web server $server using $server reload + /etc/init.d/$webserver reload 3>/dev/null || true + fi + fi done + echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -136,13 +152,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument $1" >&2 exit 0 ;; esac -db_stop - #DEBHELPER# +db_stop + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 9eae81b022b..27ce3777b7e 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,7 +17,36 @@ set -e # for details, see /usr/share/doc/packaging-manual/ -. /usr/share/debconf/confmodule + +lighttpd_remove() { + if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + echo "Remove link for Lighttpd config file" + rm -f /etc/lighttpd/conf-available/50-dolibarr.conf + if which lighty-enable-mod >/dev/null 2>&1 ; then + lighty-disable-mod dolibarr + else + echo "Lighttpd not installed, skipping" + fi + # See bug #448682 + if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then + echo 'Manually deleting lighttpd/dolibarr configuration link' + rm /etc/lighttpd/conf-enabled/50-dolibarr.conf + fi + fi +} + +apache_remove() { + if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Remove link for Apache config file" + rm -f /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi db_version 2.0 @@ -26,63 +55,62 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' -apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" -apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" -export webserver="" -# Allows us to loop and substitute in one pass -case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; -esac - case "$1" in # Call when we upgrade upgrade) + echo "postrm upgrade" ;; # Call when we uninstall remove) + echo "postrm remove" rm -f $lockfile - # 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" + # Reconfigure web server + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + + # Restart web servers + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_remove + else + apache_remove $webserver + fi + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload 3>/dev/null || true + else + /etc/init.d/$webserver reload 3>/dev/null || true + fi fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" + echo "postrm purge" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical "dolibarr/postrm" || true + db_input critical dolibarr/postrm || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get "dolibarr/postrm" + db_get dolibarr/postrm set -e if [ "$RET" = "true" ] ; then @@ -185,41 +213,12 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi - # Remove include files - export restart="" - for server in $webservers ; do - export conffile="/etc/$server/conf.d/dolibarr.conf" - if [ -f $conffile ] ; - then - echo Delete file $conffile - rm -f $conffile - status=purge - fi - - if [ "x$status" = "xpurge" ] ; - then restart="$restart $server" - fi - done - rm -rf /etc/dolibarr - # Restart servers - for server in $restart ; do - # We disable blocking errors - set +e - echo "Restart server $server if exists" - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $server reload || true - else - /etc/init.d/$server reload || true - fi - # We restore blocking errors - set -e - done - # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset "dolibarr/postrm" + db_reset dolibarr/reconfigure-webserver + db_reset dolibarr/postrm set -e #db_purge @@ -229,7 +228,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "postrm called with unknown argument $1" >&2 exit 0 ;; esac diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index d3c47e6b28d..f1527da165b 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.130 2011/08/03 00:47:37 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -306,18 +306,23 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; - #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; - #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; } # Build package for each target @@ -440,57 +445,61 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$FILENAMETGZ2"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; + print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n"; + $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\""; $ret=`$cmd`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; # Apache conf files - #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; - #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + $ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`; # Dolibarr conf files # TODO @@ -515,21 +524,21 @@ if ($nboftargetok) { $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; # Build tgz @@ -566,9 +575,11 @@ if ($nboftargetok) { next; } - + if ($target eq 'DEB') { + $olddir=getcwd(); + $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -603,7 +614,7 @@ if ($nboftargetok) { $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; - open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; + open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -657,6 +668,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`; @@ -671,19 +683,22 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache conf files + # Apache and lighttpd conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - - # Dolibarr conf files - # TODO + print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -729,17 +744,15 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - print "Go to directory $BUILDROOT\n"; - $olddir=getcwd(); - chdir("$BUILDROOT"); - - # Creation of binary package (to build without sources) + # Creation of binary package (to build without sources) + #print "Go to directory $BUILDROOT\n"; + #chdir("$BUILDROOT"); #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Creation of source package + # Prepare source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -751,6 +764,7 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; + $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -766,6 +780,9 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; + + # Creation of source package + print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/build/rpm/README b/build/rpm/README index 99a1bb3552c..f20bf91db72 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -5,17 +5,24 @@ RPM Package tools This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, -with format RPM (for Redhat, Mandriva, ...). +with format RPM (for Redhat, OpenSuse, Mandriva, ...). -# This is standard command to work on Debian packaging: +# This is standard command to work on RPM packaging: +# +# yum -y install rpmlint +# yum -y install hunspell-en hunspell-es hunspell-fr hunspell-it # # rpmlint file.rpm Test a package +# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm # # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies -# yum erase dolibarr To remove package +# yum erase dolibarr To remove package +# chcon -R -h -t httpd_sys_script_rw_t /file To add temporary context rw for httpd on /file +# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" To add persistent context rw for httpd on /dir (this add file_contexts.local) +# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage) # # On OpenSuse # yast --install dolibarr-...rpm To install package and dependencies diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index 4b4fb60dadb..337b92d8049 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -4,13 +4,14 @@ Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti -Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 708546cf263..08fe933d774 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -5,6 +5,11 @@ # file to build a package for your own distributions and # edit it if you need to match your rules. # -------------------------------------------------------- + +#%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0) +#%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) +#%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0) + %define name dolibarr %define version __VERSION__ %define release __RELEASE__ @@ -12,9 +17,12 @@ Name: %{name} Version: %{version} Release: %{release} -Summary: Dolibarr +Summary: ERP and CRM software for small and medium companies or foundations +Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos +Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations +Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti -License: GPL +License: GPLv2+ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team @@ -56,13 +64,12 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Un software ERP y CRM open source/gratis para pequeñas y -medianas empresas, asociaciones o autónomos. Incluye diferentes -funcionalidades para la Planificación de Recursos Empresariales (ERP) y -Gestión de la Relación con los Clientes (CRM) así como para para otras -diferentes actividades. Dolibarr ha sido diseñado para suministrarle -solamente las funcionalidades que necesita y haciendo hincapié en su -facilidad de uso. +Un software ERP y CRM para pequeñas y medianas empresas, asociaciones +o autónomos. Incluye diferentes funcionalidades para la Planificación +de Recursos Empresariales (ERP) y Gestión de la Relación con los +Clientes (CRM) así como para para otras diferentes actividades. +Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades +que necesita y haciendo hincapié en su facilidad de uso. %description -l fr Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, @@ -71,12 +78,12 @@ fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Un programma gestionale open source e gratuito per piccole e medie +Un programmo gestionale per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori -attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno +attività. Progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. -Dolibar è completamente web-based, progettato per poter fornire solo ciò di +Programmo web, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. @@ -94,49 +101,51 @@ echo Building %{name}-%{version}-%{release} #---- install %install -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr +%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf +%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr # %{_datadir} = /usr/share -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +%{__install} -m 644 var/www/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications +%{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README -install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/doc $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/htdocs $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT #---- clean %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT #---- files %files + %defattr(-,root,root) -%doc README -%doc COPYRIGHT %doc /var/www/dolibarr/doc/* %dir /var/www/dolibarr/build %dir /var/www/dolibarr/htdocs %dir /var/www/dolibarr/scripts -%_datadir/pixmaps/* +%_datadir/pixmaps/dolibarr.png %_datadir/applications/%{name}.desktop /var/www/dolibarr/build/* /var/www/dolibarr/htdocs/* /var/www/dolibarr/scripts/* -/var/www/dolibarr/README -/var/www/dolibarr/COPYRIGHT -#%config /var/www/dolibarr/htdocs/conf/conf.php + +%defattr(0664, -, -, 0755) +%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf +%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr #---- post (after unzip during install) @@ -154,11 +163,11 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr" +export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="/usr/share/dolibarr/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="/usr/share/dolibarr/install.lock" # Detect OS @@ -192,8 +201,8 @@ echo OS detected: $os # Create empty directory for uploaded files and generated documents echo Create document directory $docdir -mkdir -p $docdir -mkdir -p %{_sysconfdir}/dolibarr +%{__mkdir} -p $docdir +%{__mkdir} -p %{_sysconfdir}/dolibarr # Create install.forced.php into Dolibarr install directory superuserlogin='' @@ -205,12 +214,12 @@ if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then fi echo Mysql superuser found to use is $superuserlogin if [ -z "$superuserlogin" ] ; then - cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig + %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig else - cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig + %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig fi -chown -R root:$apachegroup $installconfig -chmod -R 660 $installconfig +%{__chown} -R root:$apachegroup $installconfig +%{__chmod} -R 660 $installconfig # Create an empty conf.php with permission to web server if [ ! -f $config ] @@ -222,19 +231,20 @@ then fi # Create config file for apache $apacheconfig -if [ ! -f $apacheconfig ]; then - echo Create dolibarr web server config file $apacheconfig - cp $apachefileorig $apacheconfig - chmod a-x $apacheconfig - chmod go-w $apacheconfig -fi - -# Create config file for se $seconfig -if [ ! -f $seconfig ]; then - echo Create se config file $seconfig - cp $sefileorig $seconfig +#if [ ! -f $apacheconfig ]; then +# echo Create dolibarr web server config file $apacheconfig +# cp $apachefileorig $apacheconfig # chmod a-x $apacheconfig # chmod go-w $apacheconfig +#fi + +# Create config file for se $seconfig +if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then + echo Add SE Linux permission from file $sefileorig +# cp $sefileorig $seconfig + restorecon -R -v /etc/dolibarr + restorecon -R -v /var/www/dolibarr + restorecon -R -v /usr/share/dolibarr fi # Create a config link dolibarr.conf @@ -253,18 +263,6 @@ echo Set permission to $apacheuser:$apachegroup on $docdir chown -R $apacheuser:$apachegroup $docdir chmod -R o-w $docdir -# Set SE Linux on OS SE is enabled -if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then - echo Set SELinux permissions - # Warning: chcon seems not cumulative - #chcon -R -h -t httpd_sys_content_t $targetdir - #chcon -R -h -t httpd_sys_content_t $docdir - chcon -R -h -t httpd_sys_script_rw_t $targetdir - chcon -R -h -t httpd_sys_script_rw_t $docdir - chcon -R -h -t httpd_sys_script_rw_t %{_sysconfdir}/dolibarr - #chcon -R -h -t httpd_sys_script_exec_t $targetdir -fi - # Restart web server echo Restart web server if [ -f %{_sysconfdir}/init.d/httpd ]; then @@ -274,6 +272,12 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then %{_sysconfdir}/init.d/apache2 restart fi +# Restart mysql +echo Restart mysql +if [ -f /etc/init.d/mysqld ]; then + /etc/init.d/mysqld restart +fi + # Show result echo echo "----- Dolibarr %version - (c) Dolibarr dev team -----" @@ -301,9 +305,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="$targetdir/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="$targetdir/install.lock" # Detect OS @@ -338,7 +342,7 @@ echo OS detected: $os if [ -f $apachelink ] ; then echo Delete apache config link for Dolibarr - rm -f $apachelink + %{__rm} -f $apachelink status=purge fi @@ -356,18 +360,15 @@ then fi # Removed dirs after apache restart -echo Removed remaining $apacheconfig -rm -f $apacheconfig echo Removed remaining $config -rm -f $config +%{__rm} -f $config echo Removed remaining $installconfig -rm -f $installconfig +%{__rm} -f $installconfig echo Removed remaining $lockfile -rm -f $lockfile +%{__rm} -f $lockfile echo Removed remaining dir $targetdir/doc rmdir $targetdir/doc >/dev/null 2>&1 -#echo Removed remaining dir $targetdir/htdocs -#rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm + %changelog * Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 diff --git a/build/rpm/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr index 64376e5afb6..193a43b7dbe 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -1,3 +1,3 @@ -/etc/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/var/www/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file +/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/var/www/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index f02e3d6203a..2c284c5cae8 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ */ require("../main.inc.php"); @@ -206,5 +205,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); +llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c0aaaa86213..c1d629f7b7b 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ */ require("../main.inc.php"); @@ -348,5 +347,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); +llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); ?> diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index a07b28bd2cf..f478b65e3a8 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.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/constall.php * \brief Page to show all Dolibarr setup (config file and database constants) - * \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $ + * \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $ */ require("../../main.inc.php"); diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 83dac68a99e..8b82c9f8249 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); @@ -63,11 +62,13 @@ $logout=''; print '
                '; +// Link to new sell print '
              • '.$langs->trans("NewSell").'
                • '; - -print '
              • '.$langs->trans("BackOffice").'
                • '; - -print '
              • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' '.$logout.'
                '; +// Open new tab on backoffice (this is not a disconnect from POS) +print '
              • '.$langs->trans("BackOffice").'
                • '; +// Disconnect +print '
              • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom']; +print ' '.$logout.'
                '; print $langs->trans("CashDeskThirdParty").': '.$companyLink.'
                '; /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'
                '; print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'
                '; diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 5ba2ef8997e..0c262ba2936 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ */ require("./pre.inc.php"); @@ -386,5 +385,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); +llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 9ee1f551048..525160df9ef 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ */ require("./pre.inc.php"); @@ -608,5 +607,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); +llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); ?> diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 689e2639773..79d00ae00c7 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ + * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -276,5 +275,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); +llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index e6559c2ae2e..c5664164e74 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -16,8 +16,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -25,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $ + * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ */ @@ -145,13 +144,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard + $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard + $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/'; } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php index 07fed567b48..c21450bb8cb 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ + * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 13a97bf54b3..3148174f5af 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,15 +20,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -65,7 +64,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index c03b55d2347..97d4d8252d3 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ + * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ */ require_once("../main.inc.php"); @@ -1669,7 +1668,7 @@ print '
                '; $db->close(); -llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); +llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); /* diff --git a/htdocs/index.php b/htdocs/index.php index 5998094d362..f027e94a35a 100644 --- a/htdocs/index.php +++ b/htdocs/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/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -574,7 +573,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); +llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 3724ef23d95..9b19d9793fc 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 20ef1080e85..737e16cc10c 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 5d7fca530f2..c9713870c22 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index d7df4ac6929..e7b45a476f1 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 9a0dd0fcc43..62e0a4a90cf 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 0037190af06..50fa9904890 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ + * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 6d19b01e197..2e0fccb0051 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 3050d37833c..223a2eb6d92 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -75,10 +74,12 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +$lockfile = '../../install.lock'; +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; - +#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here +$lockfile = '../../install.lock'; if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -178,7 +179,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists('../../install.lock')) +if (file_exists($lockfile)) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
                '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index c786f91346c..841136fff8b 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 1f046a29bc4..8ea28cbbcc3 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.14 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 9a109ab3fdc..4be9b6b7719 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.16 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index d1e6b216b4b..e2f225fe608 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.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_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql index 612755ce349..f2bb73a1bda 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_product_fournisseur.key.sql,v 1.3 2011/07/29 19:59:33 eldy Exp $ +-- $Id: llx_product_fournisseur.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html new file mode 100644 index 00000000000..eb72b9f79b0 --- /dev/null +++ b/htdocs/langs/es_ES/html/gpl.html @@ -0,0 +1,329 @@ + + + + + + + + +H. Licencia Pública GNU + + + + + + + + + + + + + +

                Licencia Pública GNU

                + + + + +
                + +GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 + +
                + +

                Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, + MA 02139, USA.

                +

                Está permitido, a cualquier persona, copiar y distribuir copias tal cual de + este documento de licencia, sin la introducción de cualquier cambio. +

                + +
                +

                Introducción

                +

                Las licencias de muchos softwares se desarrollan para asegurar la libertad + de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, + al contrario, pretende garantizar la libertad de compartir y alterar softwares + de libre distribución - volviéndolos de libre distribución también para cualquier + de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares + de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla + (algunos softwares de la FSF son cubiertos por la GNU Library General Public + License).

                +

                Cuando nos referimos a softwares de libre distribución, nos referimos a la + libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar + la libertad de distribución de copias de softwares de libre distribución (y + cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos + fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se + hacen algunas restricciones, para asegurar los derechos de los programadores, + prohibiendo a todas las personas su negación o la solicitación de su abdicación. + Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución + o modificación del software.

                +

                Por ejemplo, al distribuirse copias de determinado programa, por una tasa + determinada o gratuitamente, se debe informar sobre todos los derechos incidentes + sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia + Pública General GNU.

                +

                La protección de los derechos envuelve dos pasos: (1) copyright del software + y (2) licencia que da permiso legal para copia, distribución y/o modificación + del softwares.

                +

                Aún para la protección de la FSF y del autor es importante que todos entiendan + que no hay garantías para softwares de libre distribución. Si software se modifica + por alguien y lo pasa adelante, este software no más reflejará el trabajo original + del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                +

                Finalmente, cualquier programa de libre distribución está constantemente amenazado + por las patentes de softwares. Buscamos evitar el peligro de que distribuidores + de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. + Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación + de patente se debe hacer permitiendo el uso por cualquier individuo, sin la + necesidad de licencia de uso.

                +

                Los términos y condiciones precisas para copia, distribución y modificación + siguen abajo:

                +
                +

                Licencia Pública General GNU

                +

                TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN +

                + +
                  + +

                1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga + un aviso colocado por el detentor de los derechos de autor diciendo que aquel + podrá ser distribuido en las condiciones de la Licencia Pública General. El + Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado + en un Programa y significa tanto el propio Programa, como cualquier de los + trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, + un trabajo que contenga el Programa o una parte de este, en su forma original + o con modificaciones o traducido para una otra lengua (la traducción está + incluida sin limitaciones en el término ``modificación'').

                  +

                  Actividades distintas de copia, distribución y modificación no están cubiertas + por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa + no está restringido y la salida del Programa está cubierta solamente en + el caso de que su contenido contenga trabajos basados en el Programa (independientemente + de que hayan sido creados por la ejecución del Programa). Si esto es así, + depende de las funciones ejecutadas por el Programa.

                  2. + +

                2. El código fuente del Programa, de la forma como fue recibido, puede ser + copiado y distribuido, en cualquier media, desde que sea providenciado un + aviso adecuado sobre los copyrights y la negación de garantías, y todos los + avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, + estén inalterados y que cualquier producto oriundo del Programa esté acompañado + de esta Licencia Pública General.

                  +

                  Está permitido el cobro de tasas por el acto físico de transferencia o + grabación de copias, y pueden ser dadas garantías y soporte en cambio del + cobro de valores.

                  3. + + +
                3. +

                  Se puede modificar la copia o copias del Programa de cualquier forma que + se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir + tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                  + +
                    +

                  1. Debe existir un aviso destacado de que los datos originales fueron alterados + en los archivos y las fechas de los cambios;

                    2. + +

                  2. Debe existir un aviso de que el trabajo distribuido o publicado es, + de forma total o parcial, derivado del Programa o de alguna parte suya, + y que puede ser licenciado totalmente sin costes para terceros bajo los + términos de esta Licencia.

                    3. + +

                  3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, + en el inicio de tu ejecución, presentar la información de copyright y + de ausencia de garantías (o de que la garantía es de responsabilidad de + terceros), y que los usuarios pueden redistribuir el programa bajo estas + condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                    4. +
                  + + Estos requisitos se aplican a trabajos de modificación en general. Si + algunas secciones identificables no sean derivadas del Programa, y pueden + ser consideradas como partes independientes, entonces esta Licencia y sus + Términos no se aplican a aquellas secciones cuando distribuidas separadamente. + Pero al distribuir aquellas secciones como parte de un trabajo basado en + el Programa, la distribución, como un todo, debe contener los términos de + esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no + a cada una de las partes independientemente de quem los tenga desarrollado. + Más que tener intención de contestar los derechos sobre el trabajo desarrollado + por alguien, esta sección objetiva propiciar la correcta distribución de + trabajos derivados del Programa. + Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado + en él ni a un trabajo basado en él, a un volumen de almacenaje o media de + distribución no obliga la utilización de esta Licencia y de sus términos + al trabajo. +
                  4. + + +
                4. +

                  Están permitidas, la copia y la distribución, del Programa (o un trabajo + basado en éste) en la forma de código objeto o ejecutable de acuerdo con los + términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                  + +
                    +

                  1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos + en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada + para manejo de softwares o

                    +
                    2. +

                  2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, + de poner a disposición a terceros, por un coste no superior al coste del + medio físico de almacenaje, una copia completa de los códigos fuente en + medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                    +
                    3. +

                  3. Esté acompañada con la misma información recibida en relación con la + oferta de la distribución del código fuente correspondiente (esta alternativa + solamente está permitida para distribuciones no comerciales y solamente + si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, + de acuerdo con la sección 2 arriba).

                    +
                    4. +
                  + El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones + en aquel trabajo. Cuando se habla en códigos fuentes completos significa + hablar de todos los fuentes de todos los módulos, además de las definiciones + de interfaces asociadas, archivos, scripts utilizados en la compilación + y instalación del ejecutable. Como una excepción excepcional, el código + fuente distribuido podrá no incluir algunos componentes que no se encuentren + en su escopo, como compilador, kernel, etc... para el SO donde el trabajo + sea ejecutado. + Si la distribución del ejecutable o objeto se hace, a través de acceso + a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente + de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos + con los objetos simultáneamente +
                  5. + +
                5. +

                  No está permitida la copia, modificación, sublicenciamiento o distribución + del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier + tentativa de copia, modificación, sublicenciamiento o distribución del Programa + está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. + Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, + no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas + de esta Licencia.

                  6. +
                6. +

                  No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá + documento o contrato que garantice permiso de modificación o distribución + del Programa o sus trabajos derivados. Estas acciones están prohibidas por + ley, en el caso de que no se acepten las condiciones de esta Licencia. La + modificación o distribución del Programa, o cualquier trabajo basado en éste, + implica en la aceptación de esta Licencia y de todos los términos de ésta + para copia, distribución o modificación del Programa o trabajos basados en + éste.

                  7. +
                7. +

                  Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), + el recipiente automáticamente recibe una licencia del detentor original de + los derechos de copia, distribución o modificación del Programa objeto de + estos términos y condiciones. No pueden ser impuestas otras restricciones + en los recipientes.

                  8. + +
                8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes + o derechos de autor, se impongan restricciones, que contradigan esta Licencia, + estos no exentan de su aplicación. Si no es posible distribuir el Programa + de forma a garantizar simultáneamente las obligaciones de esta Licencia y + otras que sean necesarias, entonces el Programa no podrá ser distribuido. +

                  Si esta Sección se considera, inválida por cualquier motivo particular + o general, su resultado implicará en la invalidación general de esta licencia + en la copia, modificación, sublicenciamiento o distribución del Programa + o trabajos basados en éste.

                  +

                  El propósito de esta sección no es, de forma alguna, incitar a quien quiera + que sea a infringir derechos reclamados en cuestiones válidas y procedentes, + y si proteger las premisas del sistema de libre distribución de software. + Muchas personas tienen hecho contribuciones generosas al sistema, en la + forma de programas, y es necesario garantizar la consistencia y credibilidad + del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución + de los softwares.

                  +

                  Esta sección pretende hacer claro los motivos que crearan las demás cláusulas + de estas Licencia.

                  9. + +
                9. +

                  Si la distribución del Programa, dentro de los términos de esta Licencia, + tiene restricciones en algún País, por patentes o derechos de autor, el detentor + original de los derechos de autor del Programa bajo esta Licencia puede adicionar + explícitamente limitaciones geográficas de distribución, excluyendo aquellos + Países, haciendo con que la distribución solamente sea posible en los Países + no excluidos.

                  10. + +
                10. +

                  La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) + puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública + General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos + objetivos y el espirito de la presente versión, pudiendo variar en detalles + referentes a nuevas situaciones encontradas.

                  +

                  A cada versión se da un número distinto. Si el Programa especifica, un + número de versión determinado de esta Licencia, que tenga en su contenido + la expresión ``o versión más actualizada'', es posible optar por las condiciones + de aquella versión o de cualquier versión más actualizada publicada por + la FSF.

                  11. + +
                11. +

                  Si deseas incorporar parte del Programa en otros programas de libre distribución + de softwares hace falta autorización formal del autor. Para softwares que + la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde + que mantenido el espirito y objetivos originales de esta Licencia.

                  12. +
                + +

                AUSENCIA DE GARANTÍAS

                +
                  +

                1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER + GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE + EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS + DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, + LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD + Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS + CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y + REPAROS JUZGADOS NECESARIOS.

                  2. +

                2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR + LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN + RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE + HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS + O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES + O DAÑOS.

                  +

                  FIN DE LA LICENCIA

                + + +
                +

                 

                +

                Apéndice

                +

                ¿Cómo aplicar estos términos a nuevos softwares?

                +

                Si has desarrollado un nuevo programa y deseas su amplia distribución para + el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, + que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                +

                Para esto basta con anexar este aviso al programa. Se recomienda indicar aún + en el inicio de cada archivo fuente la ausencia de garantías y una anotación + de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                +

                <nombre del programa y función> Copyright (C) 199X <Autor> +

                +

                Este programa es un software de libre distribución, que puede ser copiado + y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo + con la publicada por la Free Software Foundation, versión 2 de la licencia o + (a criterio del autor) cualquier versión posterior.

                +

                Este programa se distribuye en la expectativa de ser útil a sus usuarios, + pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE + ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General + 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, ve . +

                +

                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:

                +

                Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares + NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software + de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. + Teclea 'muestra condic' para mayores detalles.

                +

                Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las + partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos + pueden variar o pueden ser accionados por otras interfaces como clic de ratón, + etc...

                +

                 

                +
                +
                + +www.conectiva.com + +
                + + + + + diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt new file mode 100644 index 00000000000..738a6bd7754 --- /dev/null +++ b/htdocs/langs/nl_BE/html/gpl.txt @@ -0,0 +1,338 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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 . + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +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 new file mode 100644 index 00000000000..778e2b02b41 --- /dev/null +++ b/htdocs/langs/nl_NL/html/gpl.txt @@ -0,0 +1,339 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van +deze licentie. \ No newline at end of file diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 49b67f9349a..1bdeb9562e6 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 03ef2767e40..eedd6a8841c 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -21,8 +21,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -30,7 +29,7 @@ * \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.350 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ */ @@ -71,14 +70,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root[]=$value; + $conf->file->dol_document_root['alt']=$value; } } diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1da2adb751e..8bccf934120 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index a65f888ab11..efbd289cb3f 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ */ require("../main.inc.php"); @@ -1646,6 +1645,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); +llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 79601ea1031..8f373b577e8 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 8cf57ec0b64..724900dc500 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ + * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ */ require("../main.inc.php"); @@ -272,5 +271,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); +llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); ?> From 62a3788bf51cefbbc81e3f024ceeb294aff9fba1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:32:42 +0000 Subject: [PATCH 045/118] Fix: Avoid errors into rpm packages From 96dc2ba7ea86134dfa333c0f548a929156a3ec4e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:43:26 +0000 Subject: [PATCH 046/118] Work on rpm package --- build/makepack-dolibarr.pl | 9 ++++----- build/rpm/dolibarr.spec | 20 +++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index f1527da165b..af7d522b167 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.130 2011/08/03 00:47:37 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.131 2011/08/03 01:43:26 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.131 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -452,7 +452,6 @@ if ($nboftargetok) { $ret=`$cmd`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; @@ -491,7 +490,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; @@ -688,7 +687,7 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 08fe933d774..e6996caa4b3 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -226,8 +226,8 @@ if [ ! -f $config ] then echo Create empty file $config touch $config - chown -R root:$apachegroup $config - chmod -R 660 $config + %{__chown} -R root:$apachegroup $config + %{__chmod} -R 660 $config fi # Create config file for apache $apacheconfig @@ -241,10 +241,12 @@ 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 + semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" + semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" + semanage fcontext -a -t httpd_sys_script_rw_t "/var/www/dolibarr/install.lock" restorecon -R -v /etc/dolibarr - restorecon -R -v /var/www/dolibarr restorecon -R -v /usr/share/dolibarr + restorecon -v /var/www/dolibarr/install.lock fi # Create a config link dolibarr.conf @@ -255,13 +257,13 @@ fi # Set permissions echo Set permission to $apacheuser:$apachegroup on $targetdir -chown -R $apacheuser:$apachegroup $targetdir -chmod -R a-w $targetdir -chmod u+w $targetdir +%{__chown} -R $apacheuser:$apachegroup $targetdir +%{__chmod} -R a-w $targetdir +%{__chmod} u+w $targetdir echo Set permission to $apacheuser:$apachegroup on $docdir -chown -R $apacheuser:$apachegroup $docdir -chmod -R o-w $docdir +%{__chown} -R $apacheuser:$apachegroup $docdir +%{__chmod} -R o-w $docdir # Restart web server echo Restart web server From d763959b7469bce1425f83fdce6133bdc097a6ae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:50:06 +0000 Subject: [PATCH 047/118] Work on rpm package --- htdocs/install/mysql/tables/llx_c_availability.sql | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index e2f225fe608..d1e6b216b4b 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ -- ======================================================================== create table llx_c_availability From cd3b30fef9ec588b3ac0a24f08c158284f8a87fa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:51:30 +0000 Subject: [PATCH 048/118] Fix: Avoid errors into rpm packages --- htdocs/langs/es_ES/html/gpl.html | 329 ------------------------------ htdocs/langs/nl_BE/html/gpl.txt | 338 ------------------------------ htdocs/langs/nl_NL/html/gpl.txt | 339 ------------------------------- 3 files changed, 1006 deletions(-) delete mode 100644 htdocs/langs/es_ES/html/gpl.html delete mode 100644 htdocs/langs/nl_BE/html/gpl.txt delete mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html deleted file mode 100644 index eb72b9f79b0..00000000000 --- a/htdocs/langs/es_ES/html/gpl.html +++ /dev/null @@ -1,329 +0,0 @@ - - - - - - - - -H. Licencia Pública GNU - - - - - - - - - - - - - -

                Licencia Pública GNU

                - - - - -
                - -GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 - -
                - -

                Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, - MA 02139, USA.

                -

                Está permitido, a cualquier persona, copiar y distribuir copias tal cual de - este documento de licencia, sin la introducción de cualquier cambio. -

                - -
                -

                Introducción

                -

                Las licencias de muchos softwares se desarrollan para asegurar la libertad - de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, - al contrario, pretende garantizar la libertad de compartir y alterar softwares - de libre distribución - volviéndolos de libre distribución también para cualquier - de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares - de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla - (algunos softwares de la FSF son cubiertos por la GNU Library General Public - License).

                -

                Cuando nos referimos a softwares de libre distribución, nos referimos a la - libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar - la libertad de distribución de copias de softwares de libre distribución (y - cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos - fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se - hacen algunas restricciones, para asegurar los derechos de los programadores, - prohibiendo a todas las personas su negación o la solicitación de su abdicación. - Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución - o modificación del software.

                -

                Por ejemplo, al distribuirse copias de determinado programa, por una tasa - determinada o gratuitamente, se debe informar sobre todos los derechos incidentes - sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia - Pública General GNU.

                -

                La protección de los derechos envuelve dos pasos: (1) copyright del software - y (2) licencia que da permiso legal para copia, distribución y/o modificación - del softwares.

                -

                Aún para la protección de la FSF y del autor es importante que todos entiendan - que no hay garantías para softwares de libre distribución. Si software se modifica - por alguien y lo pasa adelante, este software no más reflejará el trabajo original - del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                -

                Finalmente, cualquier programa de libre distribución está constantemente amenazado - por las patentes de softwares. Buscamos evitar el peligro de que distribuidores - de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. - Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación - de patente se debe hacer permitiendo el uso por cualquier individuo, sin la - necesidad de licencia de uso.

                -

                Los términos y condiciones precisas para copia, distribución y modificación - siguen abajo:

                -
                -

                Licencia Pública General GNU

                -

                TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN -

                - -
                  - -

                1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga - un aviso colocado por el detentor de los derechos de autor diciendo que aquel - podrá ser distribuido en las condiciones de la Licencia Pública General. El - Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado - en un Programa y significa tanto el propio Programa, como cualquier de los - trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, - un trabajo que contenga el Programa o una parte de este, en su forma original - o con modificaciones o traducido para una otra lengua (la traducción está - incluida sin limitaciones en el término ``modificación'').

                  -

                  Actividades distintas de copia, distribución y modificación no están cubiertas - por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa - no está restringido y la salida del Programa está cubierta solamente en - el caso de que su contenido contenga trabajos basados en el Programa (independientemente - de que hayan sido creados por la ejecución del Programa). Si esto es así, - depende de las funciones ejecutadas por el Programa.

                  2. - -

                2. El código fuente del Programa, de la forma como fue recibido, puede ser - copiado y distribuido, en cualquier media, desde que sea providenciado un - aviso adecuado sobre los copyrights y la negación de garantías, y todos los - avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, - estén inalterados y que cualquier producto oriundo del Programa esté acompañado - de esta Licencia Pública General.

                  -

                  Está permitido el cobro de tasas por el acto físico de transferencia o - grabación de copias, y pueden ser dadas garantías y soporte en cambio del - cobro de valores.

                  3. - - -
                3. -

                  Se puede modificar la copia o copias del Programa de cualquier forma que - se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir - tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                  - -
                    -

                  1. Debe existir un aviso destacado de que los datos originales fueron alterados - en los archivos y las fechas de los cambios;

                    2. - -

                  2. Debe existir un aviso de que el trabajo distribuido o publicado es, - de forma total o parcial, derivado del Programa o de alguna parte suya, - y que puede ser licenciado totalmente sin costes para terceros bajo los - términos de esta Licencia.

                    3. - -

                  3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, - en el inicio de tu ejecución, presentar la información de copyright y - de ausencia de garantías (o de que la garantía es de responsabilidad de - terceros), y que los usuarios pueden redistribuir el programa bajo estas - condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                    4. -
                  - - Estos requisitos se aplican a trabajos de modificación en general. Si - algunas secciones identificables no sean derivadas del Programa, y pueden - ser consideradas como partes independientes, entonces esta Licencia y sus - Términos no se aplican a aquellas secciones cuando distribuidas separadamente. - Pero al distribuir aquellas secciones como parte de un trabajo basado en - el Programa, la distribución, como un todo, debe contener los términos de - esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no - a cada una de las partes independientemente de quem los tenga desarrollado. - Más que tener intención de contestar los derechos sobre el trabajo desarrollado - por alguien, esta sección objetiva propiciar la correcta distribución de - trabajos derivados del Programa. - Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado - en él ni a un trabajo basado en él, a un volumen de almacenaje o media de - distribución no obliga la utilización de esta Licencia y de sus términos - al trabajo. -
                  4. - - -
                4. -

                  Están permitidas, la copia y la distribución, del Programa (o un trabajo - basado en éste) en la forma de código objeto o ejecutable de acuerdo con los - términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                  - -
                    -

                  1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos - en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada - para manejo de softwares o

                    -
                    2. -

                  2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, - de poner a disposición a terceros, por un coste no superior al coste del - medio físico de almacenaje, una copia completa de los códigos fuente en - medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                    -
                    3. -

                  3. Esté acompañada con la misma información recibida en relación con la - oferta de la distribución del código fuente correspondiente (esta alternativa - solamente está permitida para distribuciones no comerciales y solamente - si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, - de acuerdo con la sección 2 arriba).

                    -
                    4. -
                  - El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones - en aquel trabajo. Cuando se habla en códigos fuentes completos significa - hablar de todos los fuentes de todos los módulos, además de las definiciones - de interfaces asociadas, archivos, scripts utilizados en la compilación - y instalación del ejecutable. Como una excepción excepcional, el código - fuente distribuido podrá no incluir algunos componentes que no se encuentren - en su escopo, como compilador, kernel, etc... para el SO donde el trabajo - sea ejecutado. - Si la distribución del ejecutable o objeto se hace, a través de acceso - a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente - de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos - con los objetos simultáneamente -
                  5. - -
                5. -

                  No está permitida la copia, modificación, sublicenciamiento o distribución - del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier - tentativa de copia, modificación, sublicenciamiento o distribución del Programa - está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. - Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, - no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas - de esta Licencia.

                  6. -
                6. -

                  No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá - documento o contrato que garantice permiso de modificación o distribución - del Programa o sus trabajos derivados. Estas acciones están prohibidas por - ley, en el caso de que no se acepten las condiciones de esta Licencia. La - modificación o distribución del Programa, o cualquier trabajo basado en éste, - implica en la aceptación de esta Licencia y de todos los términos de ésta - para copia, distribución o modificación del Programa o trabajos basados en - éste.

                  7. -
                7. -

                  Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), - el recipiente automáticamente recibe una licencia del detentor original de - los derechos de copia, distribución o modificación del Programa objeto de - estos términos y condiciones. No pueden ser impuestas otras restricciones - en los recipientes.

                  8. - -
                8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes - o derechos de autor, se impongan restricciones, que contradigan esta Licencia, - estos no exentan de su aplicación. Si no es posible distribuir el Programa - de forma a garantizar simultáneamente las obligaciones de esta Licencia y - otras que sean necesarias, entonces el Programa no podrá ser distribuido. -

                  Si esta Sección se considera, inválida por cualquier motivo particular - o general, su resultado implicará en la invalidación general de esta licencia - en la copia, modificación, sublicenciamiento o distribución del Programa - o trabajos basados en éste.

                  -

                  El propósito de esta sección no es, de forma alguna, incitar a quien quiera - que sea a infringir derechos reclamados en cuestiones válidas y procedentes, - y si proteger las premisas del sistema de libre distribución de software. - Muchas personas tienen hecho contribuciones generosas al sistema, en la - forma de programas, y es necesario garantizar la consistencia y credibilidad - del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución - de los softwares.

                  -

                  Esta sección pretende hacer claro los motivos que crearan las demás cláusulas - de estas Licencia.

                  9. - -
                9. -

                  Si la distribución del Programa, dentro de los términos de esta Licencia, - tiene restricciones en algún País, por patentes o derechos de autor, el detentor - original de los derechos de autor del Programa bajo esta Licencia puede adicionar - explícitamente limitaciones geográficas de distribución, excluyendo aquellos - Países, haciendo con que la distribución solamente sea posible en los Países - no excluidos.

                  10. - -
                10. -

                  La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) - puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública - General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos - objetivos y el espirito de la presente versión, pudiendo variar en detalles - referentes a nuevas situaciones encontradas.

                  -

                  A cada versión se da un número distinto. Si el Programa especifica, un - número de versión determinado de esta Licencia, que tenga en su contenido - la expresión ``o versión más actualizada'', es posible optar por las condiciones - de aquella versión o de cualquier versión más actualizada publicada por - la FSF.

                  11. - -
                11. -

                  Si deseas incorporar parte del Programa en otros programas de libre distribución - de softwares hace falta autorización formal del autor. Para softwares que - la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde - que mantenido el espirito y objetivos originales de esta Licencia.

                  12. -
                - -

                AUSENCIA DE GARANTÍAS

                -
                  -

                1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER - GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE - EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS - DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, - LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD - Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS - CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y - REPAROS JUZGADOS NECESARIOS.

                  2. -

                2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR - LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN - RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE - HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS - O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES - O DAÑOS.

                  -

                  FIN DE LA LICENCIA

                - - -
                -

                 

                -

                Apéndice

                -

                ¿Cómo aplicar estos términos a nuevos softwares?

                -

                Si has desarrollado un nuevo programa y deseas su amplia distribución para - el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, - que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                -

                Para esto basta con anexar este aviso al programa. Se recomienda indicar aún - en el inicio de cada archivo fuente la ausencia de garantías y una anotación - de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                -

                <nombre del programa y función> Copyright (C) 199X <Autor> -

                -

                Este programa es un software de libre distribución, que puede ser copiado - y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo - con la publicada por la Free Software Foundation, versión 2 de la licencia o - (a criterio del autor) cualquier versión posterior.

                -

                Este programa se distribuye en la expectativa de ser útil a sus usuarios, - pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE - ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General - 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, ve . -

                -

                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:

                -

                Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares - NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software - de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. - Teclea 'muestra condic' para mayores detalles.

                -

                Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las - partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos - pueden variar o pueden ser accionados por otras interfaces como clic de ratón, - etc...

                -

                 

                -
                -
                - -www.conectiva.com - -
                - - - - - diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt deleted file mode 100644 index 738a6bd7754..00000000000 --- a/htdocs/langs/nl_BE/html/gpl.txt +++ /dev/null @@ -1,338 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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 . - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -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 deleted file mode 100644 index 778e2b02b41..00000000000 --- a/htdocs/langs/nl_NL/html/gpl.txt +++ /dev/null @@ -1,339 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van -deze licentie. \ No newline at end of file From 53d5dd0e2034ec82ad14e81d40fc280ec281cc8b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:43:26 +0000 Subject: [PATCH 049/118] Work on rpm package --- .../mysql/tables/llx_c_availability.sql | 5 +- htdocs/langs/es_ES/html/gpl.html | 329 +++++++++++++++++ htdocs/langs/nl_BE/html/gpl.txt | 338 +++++++++++++++++ htdocs/langs/nl_NL/html/gpl.txt | 339 ++++++++++++++++++ 4 files changed, 1009 insertions(+), 2 deletions(-) create mode 100644 htdocs/langs/es_ES/html/gpl.html create mode 100644 htdocs/langs/nl_BE/html/gpl.txt create mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index d1e6b216b4b..e2f225fe608 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.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_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html new file mode 100644 index 00000000000..eb72b9f79b0 --- /dev/null +++ b/htdocs/langs/es_ES/html/gpl.html @@ -0,0 +1,329 @@ + + + + + + + + +H. Licencia Pública GNU + + + + + + + + + + + + + +

                Licencia Pública GNU

                + + + + +
                + +GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 + +
                + +

                Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, + MA 02139, USA.

                +

                Está permitido, a cualquier persona, copiar y distribuir copias tal cual de + este documento de licencia, sin la introducción de cualquier cambio. +

                + +
                +

                Introducción

                +

                Las licencias de muchos softwares se desarrollan para asegurar la libertad + de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, + al contrario, pretende garantizar la libertad de compartir y alterar softwares + de libre distribución - volviéndolos de libre distribución también para cualquier + de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares + de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla + (algunos softwares de la FSF son cubiertos por la GNU Library General Public + License).

                +

                Cuando nos referimos a softwares de libre distribución, nos referimos a la + libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar + la libertad de distribución de copias de softwares de libre distribución (y + cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos + fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se + hacen algunas restricciones, para asegurar los derechos de los programadores, + prohibiendo a todas las personas su negación o la solicitación de su abdicación. + Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución + o modificación del software.

                +

                Por ejemplo, al distribuirse copias de determinado programa, por una tasa + determinada o gratuitamente, se debe informar sobre todos los derechos incidentes + sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia + Pública General GNU.

                +

                La protección de los derechos envuelve dos pasos: (1) copyright del software + y (2) licencia que da permiso legal para copia, distribución y/o modificación + del softwares.

                +

                Aún para la protección de la FSF y del autor es importante que todos entiendan + que no hay garantías para softwares de libre distribución. Si software se modifica + por alguien y lo pasa adelante, este software no más reflejará el trabajo original + del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                +

                Finalmente, cualquier programa de libre distribución está constantemente amenazado + por las patentes de softwares. Buscamos evitar el peligro de que distribuidores + de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. + Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación + de patente se debe hacer permitiendo el uso por cualquier individuo, sin la + necesidad de licencia de uso.

                +

                Los términos y condiciones precisas para copia, distribución y modificación + siguen abajo:

                +
                +

                Licencia Pública General GNU

                +

                TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN +

                + +
                  + +

                1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga + un aviso colocado por el detentor de los derechos de autor diciendo que aquel + podrá ser distribuido en las condiciones de la Licencia Pública General. El + Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado + en un Programa y significa tanto el propio Programa, como cualquier de los + trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, + un trabajo que contenga el Programa o una parte de este, en su forma original + o con modificaciones o traducido para una otra lengua (la traducción está + incluida sin limitaciones en el término ``modificación'').

                  +

                  Actividades distintas de copia, distribución y modificación no están cubiertas + por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa + no está restringido y la salida del Programa está cubierta solamente en + el caso de que su contenido contenga trabajos basados en el Programa (independientemente + de que hayan sido creados por la ejecución del Programa). Si esto es así, + depende de las funciones ejecutadas por el Programa.

                  2. + +

                2. El código fuente del Programa, de la forma como fue recibido, puede ser + copiado y distribuido, en cualquier media, desde que sea providenciado un + aviso adecuado sobre los copyrights y la negación de garantías, y todos los + avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, + estén inalterados y que cualquier producto oriundo del Programa esté acompañado + de esta Licencia Pública General.

                  +

                  Está permitido el cobro de tasas por el acto físico de transferencia o + grabación de copias, y pueden ser dadas garantías y soporte en cambio del + cobro de valores.

                  3. + + +
                3. +

                  Se puede modificar la copia o copias del Programa de cualquier forma que + se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir + tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                  + +
                    +

                  1. Debe existir un aviso destacado de que los datos originales fueron alterados + en los archivos y las fechas de los cambios;

                    2. + +

                  2. Debe existir un aviso de que el trabajo distribuido o publicado es, + de forma total o parcial, derivado del Programa o de alguna parte suya, + y que puede ser licenciado totalmente sin costes para terceros bajo los + términos de esta Licencia.

                    3. + +

                  3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, + en el inicio de tu ejecución, presentar la información de copyright y + de ausencia de garantías (o de que la garantía es de responsabilidad de + terceros), y que los usuarios pueden redistribuir el programa bajo estas + condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                    4. +
                  + + Estos requisitos se aplican a trabajos de modificación en general. Si + algunas secciones identificables no sean derivadas del Programa, y pueden + ser consideradas como partes independientes, entonces esta Licencia y sus + Términos no se aplican a aquellas secciones cuando distribuidas separadamente. + Pero al distribuir aquellas secciones como parte de un trabajo basado en + el Programa, la distribución, como un todo, debe contener los términos de + esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no + a cada una de las partes independientemente de quem los tenga desarrollado. + Más que tener intención de contestar los derechos sobre el trabajo desarrollado + por alguien, esta sección objetiva propiciar la correcta distribución de + trabajos derivados del Programa. + Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado + en él ni a un trabajo basado en él, a un volumen de almacenaje o media de + distribución no obliga la utilización de esta Licencia y de sus términos + al trabajo. +
                  4. + + +
                4. +

                  Están permitidas, la copia y la distribución, del Programa (o un trabajo + basado en éste) en la forma de código objeto o ejecutable de acuerdo con los + términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                  + +
                    +

                  1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos + en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada + para manejo de softwares o

                    +
                    2. +

                  2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, + de poner a disposición a terceros, por un coste no superior al coste del + medio físico de almacenaje, una copia completa de los códigos fuente en + medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                    +
                    3. +

                  3. Esté acompañada con la misma información recibida en relación con la + oferta de la distribución del código fuente correspondiente (esta alternativa + solamente está permitida para distribuciones no comerciales y solamente + si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, + de acuerdo con la sección 2 arriba).

                    +
                    4. +
                  + El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones + en aquel trabajo. Cuando se habla en códigos fuentes completos significa + hablar de todos los fuentes de todos los módulos, además de las definiciones + de interfaces asociadas, archivos, scripts utilizados en la compilación + y instalación del ejecutable. Como una excepción excepcional, el código + fuente distribuido podrá no incluir algunos componentes que no se encuentren + en su escopo, como compilador, kernel, etc... para el SO donde el trabajo + sea ejecutado. + Si la distribución del ejecutable o objeto se hace, a través de acceso + a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente + de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos + con los objetos simultáneamente +
                  5. + +
                5. +

                  No está permitida la copia, modificación, sublicenciamiento o distribución + del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier + tentativa de copia, modificación, sublicenciamiento o distribución del Programa + está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. + Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, + no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas + de esta Licencia.

                  6. +
                6. +

                  No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá + documento o contrato que garantice permiso de modificación o distribución + del Programa o sus trabajos derivados. Estas acciones están prohibidas por + ley, en el caso de que no se acepten las condiciones de esta Licencia. La + modificación o distribución del Programa, o cualquier trabajo basado en éste, + implica en la aceptación de esta Licencia y de todos los términos de ésta + para copia, distribución o modificación del Programa o trabajos basados en + éste.

                  7. +
                7. +

                  Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), + el recipiente automáticamente recibe una licencia del detentor original de + los derechos de copia, distribución o modificación del Programa objeto de + estos términos y condiciones. No pueden ser impuestas otras restricciones + en los recipientes.

                  8. + +
                8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes + o derechos de autor, se impongan restricciones, que contradigan esta Licencia, + estos no exentan de su aplicación. Si no es posible distribuir el Programa + de forma a garantizar simultáneamente las obligaciones de esta Licencia y + otras que sean necesarias, entonces el Programa no podrá ser distribuido. +

                  Si esta Sección se considera, inválida por cualquier motivo particular + o general, su resultado implicará en la invalidación general de esta licencia + en la copia, modificación, sublicenciamiento o distribución del Programa + o trabajos basados en éste.

                  +

                  El propósito de esta sección no es, de forma alguna, incitar a quien quiera + que sea a infringir derechos reclamados en cuestiones válidas y procedentes, + y si proteger las premisas del sistema de libre distribución de software. + Muchas personas tienen hecho contribuciones generosas al sistema, en la + forma de programas, y es necesario garantizar la consistencia y credibilidad + del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución + de los softwares.

                  +

                  Esta sección pretende hacer claro los motivos que crearan las demás cláusulas + de estas Licencia.

                  9. + +
                9. +

                  Si la distribución del Programa, dentro de los términos de esta Licencia, + tiene restricciones en algún País, por patentes o derechos de autor, el detentor + original de los derechos de autor del Programa bajo esta Licencia puede adicionar + explícitamente limitaciones geográficas de distribución, excluyendo aquellos + Países, haciendo con que la distribución solamente sea posible en los Países + no excluidos.

                  10. + +
                10. +

                  La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) + puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública + General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos + objetivos y el espirito de la presente versión, pudiendo variar en detalles + referentes a nuevas situaciones encontradas.

                  +

                  A cada versión se da un número distinto. Si el Programa especifica, un + número de versión determinado de esta Licencia, que tenga en su contenido + la expresión ``o versión más actualizada'', es posible optar por las condiciones + de aquella versión o de cualquier versión más actualizada publicada por + la FSF.

                  11. + +
                11. +

                  Si deseas incorporar parte del Programa en otros programas de libre distribución + de softwares hace falta autorización formal del autor. Para softwares que + la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde + que mantenido el espirito y objetivos originales de esta Licencia.

                  12. +
                + +

                AUSENCIA DE GARANTÍAS

                +
                  +

                1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER + GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE + EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS + DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, + LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD + Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS + CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y + REPAROS JUZGADOS NECESARIOS.

                  2. +

                2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR + LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN + RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE + HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS + O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES + O DAÑOS.

                  +

                  FIN DE LA LICENCIA

                + + +
                +

                 

                +

                Apéndice

                +

                ¿Cómo aplicar estos términos a nuevos softwares?

                +

                Si has desarrollado un nuevo programa y deseas su amplia distribución para + el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, + que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                +

                Para esto basta con anexar este aviso al programa. Se recomienda indicar aún + en el inicio de cada archivo fuente la ausencia de garantías y una anotación + de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                +

                <nombre del programa y función> Copyright (C) 199X <Autor> +

                +

                Este programa es un software de libre distribución, que puede ser copiado + y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo + con la publicada por la Free Software Foundation, versión 2 de la licencia o + (a criterio del autor) cualquier versión posterior.

                +

                Este programa se distribuye en la expectativa de ser útil a sus usuarios, + pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE + ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General + 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, ve . +

                +

                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:

                +

                Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares + NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software + de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. + Teclea 'muestra condic' para mayores detalles.

                +

                Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las + partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos + pueden variar o pueden ser accionados por otras interfaces como clic de ratón, + etc...

                +

                 

                +
                +
                + +www.conectiva.com + +
                + + + + + diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt new file mode 100644 index 00000000000..738a6bd7754 --- /dev/null +++ b/htdocs/langs/nl_BE/html/gpl.txt @@ -0,0 +1,338 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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 . + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +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 new file mode 100644 index 00000000000..778e2b02b41 --- /dev/null +++ b/htdocs/langs/nl_NL/html/gpl.txt @@ -0,0 +1,339 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van +deze licentie. \ No newline at end of file From 82aab29b486d4a4595a49e85c9b2adbf1a3953be Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:50:06 +0000 Subject: [PATCH 050/118] Work on rpm package --- htdocs/install/mysql/tables/llx_c_availability.sql | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index e2f225fe608..d1e6b216b4b 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ -- ======================================================================== create table llx_c_availability From 141c2c44fcf8342aa042d9ffc599b40f871f0413 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:51:30 +0000 Subject: [PATCH 051/118] Fix: Avoid errors into rpm packages --- htdocs/langs/es_ES/html/gpl.html | 329 ------------------------------ htdocs/langs/nl_BE/html/gpl.txt | 338 ------------------------------ htdocs/langs/nl_NL/html/gpl.txt | 339 ------------------------------- 3 files changed, 1006 deletions(-) delete mode 100644 htdocs/langs/es_ES/html/gpl.html delete mode 100644 htdocs/langs/nl_BE/html/gpl.txt delete mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html deleted file mode 100644 index eb72b9f79b0..00000000000 --- a/htdocs/langs/es_ES/html/gpl.html +++ /dev/null @@ -1,329 +0,0 @@ - - - - - - - - -H. Licencia Pública GNU - - - - - - - - - - - - - -

                Licencia Pública GNU

                - - - - -
                - -GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 - -
                - -

                Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, - MA 02139, USA.

                -

                Está permitido, a cualquier persona, copiar y distribuir copias tal cual de - este documento de licencia, sin la introducción de cualquier cambio. -

                - -
                -

                Introducción

                -

                Las licencias de muchos softwares se desarrollan para asegurar la libertad - de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, - al contrario, pretende garantizar la libertad de compartir y alterar softwares - de libre distribución - volviéndolos de libre distribución también para cualquier - de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares - de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla - (algunos softwares de la FSF son cubiertos por la GNU Library General Public - License).

                -

                Cuando nos referimos a softwares de libre distribución, nos referimos a la - libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar - la libertad de distribución de copias de softwares de libre distribución (y - cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos - fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se - hacen algunas restricciones, para asegurar los derechos de los programadores, - prohibiendo a todas las personas su negación o la solicitación de su abdicación. - Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución - o modificación del software.

                -

                Por ejemplo, al distribuirse copias de determinado programa, por una tasa - determinada o gratuitamente, se debe informar sobre todos los derechos incidentes - sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia - Pública General GNU.

                -

                La protección de los derechos envuelve dos pasos: (1) copyright del software - y (2) licencia que da permiso legal para copia, distribución y/o modificación - del softwares.

                -

                Aún para la protección de la FSF y del autor es importante que todos entiendan - que no hay garantías para softwares de libre distribución. Si software se modifica - por alguien y lo pasa adelante, este software no más reflejará el trabajo original - del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                -

                Finalmente, cualquier programa de libre distribución está constantemente amenazado - por las patentes de softwares. Buscamos evitar el peligro de que distribuidores - de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. - Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación - de patente se debe hacer permitiendo el uso por cualquier individuo, sin la - necesidad de licencia de uso.

                -

                Los términos y condiciones precisas para copia, distribución y modificación - siguen abajo:

                -
                -

                Licencia Pública General GNU

                -

                TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN -

                - -
                  - -

                1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga - un aviso colocado por el detentor de los derechos de autor diciendo que aquel - podrá ser distribuido en las condiciones de la Licencia Pública General. El - Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado - en un Programa y significa tanto el propio Programa, como cualquier de los - trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, - un trabajo que contenga el Programa o una parte de este, en su forma original - o con modificaciones o traducido para una otra lengua (la traducción está - incluida sin limitaciones en el término ``modificación'').

                  -

                  Actividades distintas de copia, distribución y modificación no están cubiertas - por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa - no está restringido y la salida del Programa está cubierta solamente en - el caso de que su contenido contenga trabajos basados en el Programa (independientemente - de que hayan sido creados por la ejecución del Programa). Si esto es así, - depende de las funciones ejecutadas por el Programa.

                  2. - -

                2. El código fuente del Programa, de la forma como fue recibido, puede ser - copiado y distribuido, en cualquier media, desde que sea providenciado un - aviso adecuado sobre los copyrights y la negación de garantías, y todos los - avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, - estén inalterados y que cualquier producto oriundo del Programa esté acompañado - de esta Licencia Pública General.

                  -

                  Está permitido el cobro de tasas por el acto físico de transferencia o - grabación de copias, y pueden ser dadas garantías y soporte en cambio del - cobro de valores.

                  3. - - -
                3. -

                  Se puede modificar la copia o copias del Programa de cualquier forma que - se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir - tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                  - -
                    -

                  1. Debe existir un aviso destacado de que los datos originales fueron alterados - en los archivos y las fechas de los cambios;

                    2. - -

                  2. Debe existir un aviso de que el trabajo distribuido o publicado es, - de forma total o parcial, derivado del Programa o de alguna parte suya, - y que puede ser licenciado totalmente sin costes para terceros bajo los - términos de esta Licencia.

                    3. - -

                  3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, - en el inicio de tu ejecución, presentar la información de copyright y - de ausencia de garantías (o de que la garantía es de responsabilidad de - terceros), y que los usuarios pueden redistribuir el programa bajo estas - condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                    4. -
                  - - Estos requisitos se aplican a trabajos de modificación en general. Si - algunas secciones identificables no sean derivadas del Programa, y pueden - ser consideradas como partes independientes, entonces esta Licencia y sus - Términos no se aplican a aquellas secciones cuando distribuidas separadamente. - Pero al distribuir aquellas secciones como parte de un trabajo basado en - el Programa, la distribución, como un todo, debe contener los términos de - esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no - a cada una de las partes independientemente de quem los tenga desarrollado. - Más que tener intención de contestar los derechos sobre el trabajo desarrollado - por alguien, esta sección objetiva propiciar la correcta distribución de - trabajos derivados del Programa. - Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado - en él ni a un trabajo basado en él, a un volumen de almacenaje o media de - distribución no obliga la utilización de esta Licencia y de sus términos - al trabajo. -
                  4. - - -
                4. -

                  Están permitidas, la copia y la distribución, del Programa (o un trabajo - basado en éste) en la forma de código objeto o ejecutable de acuerdo con los - términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                  - -
                    -

                  1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos - en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada - para manejo de softwares o

                    -
                    2. -

                  2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, - de poner a disposición a terceros, por un coste no superior al coste del - medio físico de almacenaje, una copia completa de los códigos fuente en - medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                    -
                    3. -

                  3. Esté acompañada con la misma información recibida en relación con la - oferta de la distribución del código fuente correspondiente (esta alternativa - solamente está permitida para distribuciones no comerciales y solamente - si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, - de acuerdo con la sección 2 arriba).

                    -
                    4. -
                  - El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones - en aquel trabajo. Cuando se habla en códigos fuentes completos significa - hablar de todos los fuentes de todos los módulos, además de las definiciones - de interfaces asociadas, archivos, scripts utilizados en la compilación - y instalación del ejecutable. Como una excepción excepcional, el código - fuente distribuido podrá no incluir algunos componentes que no se encuentren - en su escopo, como compilador, kernel, etc... para el SO donde el trabajo - sea ejecutado. - Si la distribución del ejecutable o objeto se hace, a través de acceso - a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente - de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos - con los objetos simultáneamente -
                  5. - -
                5. -

                  No está permitida la copia, modificación, sublicenciamiento o distribución - del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier - tentativa de copia, modificación, sublicenciamiento o distribución del Programa - está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. - Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, - no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas - de esta Licencia.

                  6. -
                6. -

                  No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá - documento o contrato que garantice permiso de modificación o distribución - del Programa o sus trabajos derivados. Estas acciones están prohibidas por - ley, en el caso de que no se acepten las condiciones de esta Licencia. La - modificación o distribución del Programa, o cualquier trabajo basado en éste, - implica en la aceptación de esta Licencia y de todos los términos de ésta - para copia, distribución o modificación del Programa o trabajos basados en - éste.

                  7. -
                7. -

                  Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), - el recipiente automáticamente recibe una licencia del detentor original de - los derechos de copia, distribución o modificación del Programa objeto de - estos términos y condiciones. No pueden ser impuestas otras restricciones - en los recipientes.

                  8. - -
                8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes - o derechos de autor, se impongan restricciones, que contradigan esta Licencia, - estos no exentan de su aplicación. Si no es posible distribuir el Programa - de forma a garantizar simultáneamente las obligaciones de esta Licencia y - otras que sean necesarias, entonces el Programa no podrá ser distribuido. -

                  Si esta Sección se considera, inválida por cualquier motivo particular - o general, su resultado implicará en la invalidación general de esta licencia - en la copia, modificación, sublicenciamiento o distribución del Programa - o trabajos basados en éste.

                  -

                  El propósito de esta sección no es, de forma alguna, incitar a quien quiera - que sea a infringir derechos reclamados en cuestiones válidas y procedentes, - y si proteger las premisas del sistema de libre distribución de software. - Muchas personas tienen hecho contribuciones generosas al sistema, en la - forma de programas, y es necesario garantizar la consistencia y credibilidad - del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución - de los softwares.

                  -

                  Esta sección pretende hacer claro los motivos que crearan las demás cláusulas - de estas Licencia.

                  9. - -
                9. -

                  Si la distribución del Programa, dentro de los términos de esta Licencia, - tiene restricciones en algún País, por patentes o derechos de autor, el detentor - original de los derechos de autor del Programa bajo esta Licencia puede adicionar - explícitamente limitaciones geográficas de distribución, excluyendo aquellos - Países, haciendo con que la distribución solamente sea posible en los Países - no excluidos.

                  10. - -
                10. -

                  La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) - puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública - General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos - objetivos y el espirito de la presente versión, pudiendo variar en detalles - referentes a nuevas situaciones encontradas.

                  -

                  A cada versión se da un número distinto. Si el Programa especifica, un - número de versión determinado de esta Licencia, que tenga en su contenido - la expresión ``o versión más actualizada'', es posible optar por las condiciones - de aquella versión o de cualquier versión más actualizada publicada por - la FSF.

                  11. - -
                11. -

                  Si deseas incorporar parte del Programa en otros programas de libre distribución - de softwares hace falta autorización formal del autor. Para softwares que - la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde - que mantenido el espirito y objetivos originales de esta Licencia.

                  12. -
                - -

                AUSENCIA DE GARANTÍAS

                -
                  -

                1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER - GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE - EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS - DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, - LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD - Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS - CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y - REPAROS JUZGADOS NECESARIOS.

                  2. -

                2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR - LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN - RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE - HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS - O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES - O DAÑOS.

                  -

                  FIN DE LA LICENCIA

                - - -
                -

                 

                -

                Apéndice

                -

                ¿Cómo aplicar estos términos a nuevos softwares?

                -

                Si has desarrollado un nuevo programa y deseas su amplia distribución para - el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, - que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                -

                Para esto basta con anexar este aviso al programa. Se recomienda indicar aún - en el inicio de cada archivo fuente la ausencia de garantías y una anotación - de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                -

                <nombre del programa y función> Copyright (C) 199X <Autor> -

                -

                Este programa es un software de libre distribución, que puede ser copiado - y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo - con la publicada por la Free Software Foundation, versión 2 de la licencia o - (a criterio del autor) cualquier versión posterior.

                -

                Este programa se distribuye en la expectativa de ser útil a sus usuarios, - pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE - ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General - 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, ve . -

                -

                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:

                -

                Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares - NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software - de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. - Teclea 'muestra condic' para mayores detalles.

                -

                Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las - partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos - pueden variar o pueden ser accionados por otras interfaces como clic de ratón, - etc...

                -

                 

                -
                -
                - -www.conectiva.com - -
                - - - - - diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt deleted file mode 100644 index 738a6bd7754..00000000000 --- a/htdocs/langs/nl_BE/html/gpl.txt +++ /dev/null @@ -1,338 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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 . - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -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 deleted file mode 100644 index 778e2b02b41..00000000000 --- a/htdocs/langs/nl_NL/html/gpl.txt +++ /dev/null @@ -1,339 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van -deze licentie. \ No newline at end of file From f5689272d4cf57482d8864e0b980a6b7d48cb4b6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 23:19:04 +0000 Subject: [PATCH 052/118] Fix: Avoid errors into rpm packages --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/control.DEBIAN | 46 + build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 - build/deb/install | 1 - build/deb/po/fr.po | 22 +- build/deb/po/templates.pot | 20 +- build/deb/postinst | 100 +- build/deb/postrm | 119 +- build/deb/templates | 7 - build/makepack-dolibarr.pl | 164 ++- build/rpm/README | 13 +- build/rpm/dolibarr.desktop | 3 +- build/rpm/dolibarr.spec | 173 ++- build/rpm/file_contexts.dolibarr | 6 +- dev/skeletons/modMyModule.class.php | 4 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 33 +- htdocs/admin/perms.php | 32 +- htdocs/boxes.php | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/tpl/menu.tpl.php | 13 +- htdocs/cashdesk/tpl/validation1.tpl.php | 21 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/core/class/conf.class.php | 9 +- htdocs/core/class/cookie.class.php | 5 +- htdocs/core/class/html.form.class.php | 11 +- htdocs/core/class/interfaces.class.php | 5 +- htdocs/imports/import.php | 7 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 +++++++++-------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/install/check.php | 5 +- htdocs/install/default.css | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 5 +- .../mysql/data/llx_20_c_departements.sql | 5 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- .../install/mysql/data/llx_c_currencies.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/data/llx_c_tva.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_departements.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_regions.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- htdocs/install/mysql/tables/llx_commande.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../mysql/tables/llx_commande_fournisseur.sql | 5 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../tables/llx_product_fournisseur.key.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/install/upgrade2.php | 5 +- htdocs/langs/es_ES/html/gpl.html | 330 ++++++ htdocs/langs/nl_BE/html/gpl.txt | 340 ++++++ htdocs/langs/nl_NL/html/gpl.txt | 339 ++++++ htdocs/lib/admin.lib.php | 77 +- htdocs/lib/ajax.lib.php | 5 +- htdocs/lib/pdf.lib.php | 5 +- htdocs/master.inc.php | 6 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/societe/soc.php | 10 +- .../smartphone/theme/default/default.css.php | 5 +- htdocs/user/group/perms.php | 34 +- htdocs/user/perms.php | 32 +- 342 files changed, 2848 insertions(+), 1723 deletions(-) create mode 100755 build/deb/control.DEBIAN create mode 100644 htdocs/langs/es_ES/html/gpl.html create mode 100644 htdocs/langs/nl_BE/html/gpl.txt create mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index d73d7a99219..edb46ffd5a3 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,13 +22,12 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build binary only package +# dpkg -b To build package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# dpkg-reconfigure -plow package Reconfigure package +# # dpkg -L packagename List content of installed package -# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index 3382966714b..b035f18ae1d 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 + -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN new file mode 100755 index 00000000000..7c66775bdf1 --- /dev/null +++ b/build/deb/control.DEBIAN @@ -0,0 +1,46 @@ +Package: dolibarr +Version: __VERSION__ +Architecture: all +Maintainer: Laurent Destailleur +Installed-Size: 61200 +Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Section: web +Priority: optional +Homepage: http://www.dolibarr.org +Description: Easy to use web based ERP & CRM software + Dolibarr ERP & CRM is an easy to use open source/free software for small + and medium companies, foundations or freelances. It includes different + features for Enterprise Resource Planning (ERP) and Customer Relationship + Management (CRM) but also for different other activities. + It's a web software you can install as a standalone program or on any web + hosting provider to use it from anywhere with any web browser. + Dolibarr was designed to provide only features you need and be easy to use. + . + Only features you need are visible, depending on which module were activated. + Most common used modules are: + . + Customers, Suppliers or Prospects directory, + Contacts directory, + Orders management, + Commercial proposals management, + Invoices management, + Products and services catalog, + Stock management, + Foundations members management, + Bank accounts management, + Point of Sale, + Payments management, + Commercial actions management, + Contracts management, + Standing orders management, + Shipping management, + Donations management, + Bookmarks management, + Mass Emailings, + Reports, + Wizards to export and import data, + LDAP connectivity, + PDF exports, + And a lot of more modules... + . + You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index e28258d8dbc..91f0705c001 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,16 +4,10 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper (>= 7), po-debconf +Build-Depends: debhelper, po-debconf Package: dolibarr -Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, - php5-mysql | php5-mysqli, - php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, - ${misc:Depends}, xdg-utils, - mysql-server, perl -Recommends: apache2 | lighttpd | httpd, mysql-client -Suggests: www-browser +Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl Architecture: all Section: web Priority: optional diff --git a/build/deb/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 b/build/deb/install index 2928d378abc..4d41fd52c65 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,5 +1,4 @@ etc/dolibarr/apache.conf -etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 3bbe762283a..13b8030ed0d 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:49+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,26 +25,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Seveur web à reconfigurer automatiquement:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"dolibarr." -msgstr "" -"Selectionnez le serveur web à configurer automatiquement pour utiliser " -"dolibarr." - # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -52,7 +36,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index d65e5d8b7f6..32c92a97cc4 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,29 +17,15 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"dolibarr." -msgstr "" - #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index e0bba1be4da..ca5fd1645dd 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,5 +1,7 @@ #!/bin/sh # postinst script for dolibarr +# +# see: dh_installdeb(1) set -e @@ -14,31 +16,6 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - - -lighttpd_install() { - if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - if which lighty-enable-mod >/dev/null 2>&1 ; then - echo "Add link for Lighttpd config file" - ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf - # We enabled it - lighty-enable-mod dolibarr fastcgi-php - else - echo "Lighttpd not installed, skipping" - fi - fi -} - -apache_install() { - webserver=$1 - if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Add link for Apache config file" - ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - . /usr/share/debconf/confmodule db_version 2.0 @@ -50,6 +27,8 @@ echo Run the dolibarr postinst script # Define vars docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" installconfig="/etc/dolibarr/install.forced.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php" @@ -65,6 +44,10 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir + # Copy apache.conf file into target directory + #mkdir -p /etc/dolibarr + #cp -p $apachefileorig $apacheconfig + # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -91,15 +74,21 @@ case "$1" in chmod -R 660 $config fi - - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - + # Get the web server type (use db_get for interactive mode). + #db_reset "dolibarr/webserver" + #db_get "dolibarr/webserver" # Read value for webserver. + #webserver="$RET" + + case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; + esac + # Set up web server. - for webserver in $webservers ; do - webserver=${webserver%,} - echo Complete config of server $webserver + for server in $webservers ; do + echo Complete config of server $server # Detect webuser and webgroup webuser= @@ -117,31 +106,26 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config + + # Add link to config file + echo Setup web server $server to add dolibarr config file + ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf + done - # Restart web server. - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_install - else - apache_install $webserver - fi - # Reload webserver in any case, configuration might have changed - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $webserver reload 3>/dev/null || true - else - echo Restart web server $server using $server reload - /etc/init.d/$webserver reload 3>/dev/null || true - fi - fi + # Restart servers + servers="apache2-ssl apache2 mysql" + # Another way to restart + for server in $servers ; do + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $server reload || true + else + echo Restart web server $server using $server reload + /etc/init.d/$server reload || true + fi done - echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -152,13 +136,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument $1" >&2 + echo "postinst called with unknown argument \`$1'" >&2 exit 0 ;; esac -#DEBHELPER# - db_stop +#DEBHELPER# + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 27ce3777b7e..9eae81b022b 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,36 +17,7 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - -lighttpd_remove() { - if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - echo "Remove link for Lighttpd config file" - rm -f /etc/lighttpd/conf-available/50-dolibarr.conf - if which lighty-enable-mod >/dev/null 2>&1 ; then - lighty-disable-mod dolibarr - else - echo "Lighttpd not installed, skipping" - fi - # See bug #448682 - if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then - echo 'Manually deleting lighttpd/dolibarr configuration link' - rm /etc/lighttpd/conf-enabled/50-dolibarr.conf - fi - fi -} - -apache_remove() { - if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Remove link for Apache config file" - rm -f /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule -fi +. /usr/share/debconf/confmodule db_version 2.0 @@ -55,62 +26,63 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" +export webserver="" +# Allows us to loop and substitute in one pass +case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; +esac + case "$1" in # Call when we upgrade upgrade) - echo "postrm upgrade" ;; # Call when we uninstall remove) - echo "postrm remove" rm -f $lockfile - # Reconfigure web server - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - - # Restart web servers - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_remove - else - apache_remove $webserver - fi - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $webserver reload 3>/dev/null || true - else - /etc/init.d/$webserver reload 3>/dev/null || true - fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete link $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge" + echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical dolibarr/postrm || true + db_input critical "dolibarr/postrm" || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get dolibarr/postrm + db_get "dolibarr/postrm" set -e if [ "$RET" = "true" ] ; then @@ -213,12 +185,41 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete file $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" + fi + done + rm -rf /etc/dolibarr + # Restart servers + for server in $restart ; do + # We disable blocking errors + set +e + echo "Restart server $server if exists" + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $server reload || true + else + /etc/init.d/$server reload || true + fi + # We restore blocking errors + set -e + done + # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset dolibarr/reconfigure-webserver - db_reset dolibarr/postrm + db_reset "dolibarr/postrm" set -e #db_purge @@ -228,7 +229,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument $1" >&2 + echo "postrm called with unknown argument \`$1'" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index b96325a4e64..5c06afd8ccd 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,10 +1,3 @@ -Template: dolibarr/reconfigure-webserver -Type: multiselect -Choices: apache2, lighttpd -_Description: Web server to reconfigure automatically: - Please choose the web server that should be automatically configured - to run dolibarr. - Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index af7d522b167..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.131 2011/08/03 01:43:26 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.131 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -306,23 +306,18 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; + #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; + #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; } # Build package for each target @@ -445,60 +440,57 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$FILENAMETGZ2"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; - print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n"; - $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\""; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; $ret=`$cmd`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; # Apache conf files - print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; - $ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`; + #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; # Dolibarr conf files # TODO @@ -523,21 +515,21 @@ if ($nboftargetok) { $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; # Build tgz @@ -574,11 +566,9 @@ if ($nboftargetok) { next; } - + if ($target eq 'DEB') { - $olddir=getcwd(); - $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -613,7 +603,7 @@ if ($nboftargetok) { $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; - open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error"; + open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -667,7 +657,6 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`; @@ -682,22 +671,19 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache and lighttpd conf files + # Apache conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; + + # Dolibarr conf files + # TODO # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -743,15 +729,17 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - # Creation of binary package (to build without sources) - #print "Go to directory $BUILDROOT\n"; - #chdir("$BUILDROOT"); + print "Go to directory $BUILDROOT\n"; + $olddir=getcwd(); + chdir("$BUILDROOT"); + + # Creation of binary package (to build without sources) #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Prepare source package + # Creation of source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -763,7 +751,6 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; - $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -779,9 +766,6 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; - - # Creation of source package - print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; 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 e6996caa4b3..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,39 +205,36 @@ 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 ] then echo Create empty file $config touch $config - %{__chown} -R root:$apachegroup $config - %{__chmod} -R 660 $config + chown -R root:$apachegroup $config + chmod -R 660 $config fi # Create config file for apache $apacheconfig -#if [ ! -f $apacheconfig ]; then -# echo Create dolibarr web server config file $apacheconfig -# cp $apachefileorig $apacheconfig -# chmod a-x $apacheconfig -# chmod go-w $apacheconfig -#fi +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 - semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" - semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" - semanage fcontext -a -t httpd_sys_script_rw_t "/var/www/dolibarr/install.lock" - restorecon -R -v /etc/dolibarr - restorecon -R -v /usr/share/dolibarr - restorecon -v /var/www/dolibarr/install.lock +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 @@ -257,13 +245,25 @@ fi # Set permissions echo Set permission to $apacheuser:$apachegroup on $targetdir -%{__chown} -R $apacheuser:$apachegroup $targetdir -%{__chmod} -R a-w $targetdir -%{__chmod} u+w $targetdir +chown -R $apacheuser:$apachegroup $targetdir +chmod -R a-w $targetdir +chmod u+w $targetdir echo Set permission to $apacheuser:$apachegroup on $docdir -%{__chown} -R $apacheuser:$apachegroup $docdir -%{__chmod} -R o-w $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 @@ -274,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 -----" @@ -307,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 @@ -344,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 @@ -362,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/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/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/css/style.css b/htdocs/cashdesk/css/style.css index 698cceb4966..c79d46fbeb5 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,10 +11,11 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ +/* \version $Id$ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index 2d89cfd2388..f91946e11c0 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.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. */ // Instanciation et initialisation de l'objet xmlhttprequest 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/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/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 96de90124f9..259dc4dbce5 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -47,7 +48,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -66,7 +67,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -77,17 +78,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 0efb704828f..e05eaa66ecf 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ + * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ */ require('../main.inc.php'); @@ -1031,5 +1032,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); +llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 5da397b4183..d2f2a7aae7e 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ + * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ */ require('../main.inc.php'); @@ -672,5 +673,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); +llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index c5664164e74..e6559c2ae2e 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -16,7 +16,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -24,7 +25,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ + * \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $ */ @@ -144,13 +145,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; + $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/'; + $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php index c21450bb8cb..07fed567b48 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,13 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index e24b3c7c717..cb4a0f7a5cf 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -23,14 +23,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.193 2011/07/31 23:45:14 eldy Exp $ + * \version $Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $ */ @@ -160,10 +161,8 @@ class Form $htmltext=str_replace("\n","",$htmltext); $htmltext=str_replace('"',""",$htmltext); - if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip - else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag - if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip - else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip + $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag $s=""; if (empty($notabs)) $s.=''; diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 2ca2f82789e..8deeda0fb57 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/interfaces.class.php * \ingroup core * \brief Fichier de la classe de gestion des triggers - * \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $ */ diff --git a/htdocs/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/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 6f6c7ed2a1b..257b95e4e3c 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -64,7 +65,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.31 $'); + $ver=explode(' ','$Revision: 1.30 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 446606ef055..127eb16e389 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -63,7 +64,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
                  This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.28 $'); + $ver=explode(' ','$Revision: 1.27 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 46fa4c9ccc4..9c90d1fcc94 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,7 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program. If not, see . +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* or see http://www.gnu.org/ */ /** @@ -20,7 +22,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -59,7 +61,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
                  This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.14 $'); + $ver=explode(' ','$Revision$'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index 7055bef4b69..ec7e1af07c6 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ + * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/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/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index 067e831b0b4..b1e3f5a2638 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,503 +1,504 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index e5f0ff4c0e5..b1e3f5a2638 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,7 +484,8 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9b19d9793fc..3724ef23d95 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 1d2084e7c7f..9978c8f437a 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/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.24 2011/08/03 01:32:42 eldy Exp $ + * $Id$ */ body { diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 737e16cc10c..20ef1080e85 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ + * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index c9713870c22..5d7fca530f2 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index e7b45a476f1..d7df4ac6929 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 62e0a4a90cf..9a0dd0fcc43 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ + * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 50fa9904890..0037190af06 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 2e0fccb0051..6d19b01e197 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ + * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 223a2eb6d92..3050d37833c 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -74,12 +75,10 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -$lockfile = '../../install.lock'; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; -#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here -$lockfile = '../../install.lock'; + if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -179,7 +178,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists($lockfile)) +if (file_exists('../../install.lock')) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
                  '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index 841136fff8b..c786f91346c 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ + * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 275298588e2..9d08a56e41c 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,9 +17,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_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 8ea28cbbcc3..1f046a29bc4 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -18,9 +18,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_10_c_regions.sql,v 1.14 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 4be9b6b7719..9a109ab3fdc 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -18,9 +18,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_20_c_departements.sql,v 1.16 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index da244f79951..56ceea3d807 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,9 +17,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_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index eee5dfa185a..3a248c2f49f 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,9 +18,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_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index e3922b97f65..dcbaf2faaf4 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,9 +17,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_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index b7f6c71c87e..1dd3cb59a62 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,9 +11,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_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index f3299990858..5e93e39d048 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,9 +17,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_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index 1f14cc8c142..e3ed8196d17 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,9 +17,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_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 5017ce0c60d..176e5c796e2 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,9 +17,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_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql index eeb2c376b85..ad7c175fcc4 100644 --- a/htdocs/install/mysql/data/llx_c_currencies.sql +++ b/htdocs/install/mysql/data/llx_c_currencies.sql @@ -17,9 +17,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_c_currencies.sql,v 1.8 2011/08/03 01:25:46 eldy Exp $ +-- $Id: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index f58db2b32a6..db630463dbf 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,9 +17,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_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index 079caa7dde4..c67d263853d 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,9 +17,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_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 4bb81528e74..07fa2abaa83 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,9 +18,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_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index 720413ac480..e29b3f306f5 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,9 +17,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_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index cb0b557b438..c7fa6b6dd1f 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.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_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index a3a19cc2125..6a597996424 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,9 +17,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_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 1ec498e6bc2..78e174b9817 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,9 +17,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_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a17978bb0c..3a535a5098e 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,9 +17,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_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index 96d456312df..f6395abbfcd 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,9 +17,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_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 488b0a564eb..9c28f697f83 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,9 +17,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_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index d8701c52c01..988d9c26136 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,9 +17,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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- @@ -33,4 +34,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2fd47385a90..2d1a3c62a39 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,9 +17,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_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 788e9e82f39..056dbdbdb6e 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -18,9 +18,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_c_tva.sql,v 1.27 2011/08/03 01:25:44 eldy Exp $ +-- $Id: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index da98640fd25..4238000eb14 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,9 +17,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_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 789ad16fce2..6e596be24e5 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,9 +17,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_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index 48b77951e1f..e2faed3cba3 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,9 +17,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_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index 59bd3d1ef00..cf7e9e96275 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,9 +17,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_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index cd2f27a5dca..655848a50ae 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.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: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 42f86f1c447..968a131e2bb 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -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: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 685170362fd..6e6e960072b 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.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_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 921bc569980..02ff06ba9f1 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.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_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index d5902b539c7..f22262c9353 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.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_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index ddd3d734ff7..b2cdf08af5f 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.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_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 8c5c23bbe62..031bfb614e1 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -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: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index f7b876eed86..3aa9555979e 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -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: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 8d34e2a9c78..4703aa32ddd 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -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: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index ad6f448e3dc..69bf706ca68 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,9 +15,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_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 51d66c04584..9156b439833 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,9 +15,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_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index 7df7f21a3b9..db64e0cbf9c 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -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: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index 31676d7d6e2..a7efcbd0f6d 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -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: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index bc9d9ad0936..7e4fa074e71 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -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: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index 18eed730ab8..d23a1367f92 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index ade41da746e..2b2db5af657 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index 62a88236480..b5c9175202b 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 015a9e9b4c0..6ed1e00dd88 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index 296b49fc93f..d1279c21eb2 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 9cedf70e7ca..822a69bc4ec 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index 55718d8ffb5..aba765190ee 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.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_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index abc9baa2d8c..eded16c49fe 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -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: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index 3dd83585bcd..e39fbf71f12 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -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: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 217edcaddbb..3710a87470a 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -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: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index 5869f24d8bd..ad41449f288 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -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: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index 5db17f19069..f6301a24919 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index 5f66ff625f0..cd68a9cdb40 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index b0546729ef0..890c7597862 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.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_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index 4794113f8bd..d67cf7fe4b8 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -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: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5fc25f57339..5c06c73c69d 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 5746cce26aa..115bd310d70 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index ba1e56e2b94..d3c71cc4a70 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.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_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index de9c23e9c05..10c4cc2d853 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,10 +13,11 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, 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_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index cce9d04707b..09365976d78 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.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_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 93e8e3d99a7..463b1235094 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -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: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index b0f31fe7116..c81a2b3e830 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -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: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index cb2251cfaf6..821fe3e5c04 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -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: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 8bebcf13116..9380607010d 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index b30354cae19..e524d9c937a 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index b026a40d762..0b0b34390c4 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -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: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 39d21cee7b9..7b5fa661d7d 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -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: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index d1e6b216b4b..e2f225fe608 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.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_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 60af7723f30..66cd5111325 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -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: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index cb223ae5532..ebca12ab5da 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -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: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 415b8526793..3872bedd39d 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -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: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index 5c54695f608..bed4ad41dfc 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 93ef5d59770..23cd0f575ed 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index 7702a8cf21e..f46d2a56c33 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.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_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_departements.sql b/htdocs/install/mysql/tables/llx_c_departements.sql index ea1f7543428..ab0ea5dc0c3 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.sql @@ -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: llx_c_departements.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id: llx_c_departements.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ -- ======================================================================== create table llx_c_departements diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 46a35567e95..4669de108f4 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.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_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index c2c43a3a625..a6bb8ca70f7 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -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: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 547500d7f33..5637e5a987d 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -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: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index bf7ed18af80..884d8274cfd 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.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_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index d0dceaf0fe1..2b6dea6cbd3 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -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: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 192183be0c1..76aecebbb9a 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -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: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index d6d673962b9..665a210d74b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -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: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index c8deefef6d7..7fcd57e31eb 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -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: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index 757653f1fc2..e1cab3b3368 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -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: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f2fb7fda4d3..f97e458be6b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -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: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 7a228ec1572..165a8550331 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -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: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 120e27ae77d..6efa388ef81 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.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_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index a5e3fd8721b..c8824b2d04e 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.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_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 418e37a85b1..311183c87f4 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.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_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 1cc5dbfaf0e..2d00f620e02 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -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: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 84c72e0839b..02052920c8a 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -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: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 8cf0ec900f8..0f608cbc171 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.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_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 2eed307bc54..75b40946559 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.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_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql index 5ef6fb221e6..d9d0f2d1b0c 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.sql @@ -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: llx_c_regions.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id: llx_c_regions.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ -- ======================================================================== create table llx_c_regions diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index c977dd9dd21..76caf44356d 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 8307ca88eb6..861671e3607 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -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: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 9a7bda88c28..46504e8a1c4 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -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: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index 725ddbfeb90..dc284fc8cea 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -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: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index a1feeb33f8b..4f8736a3a14 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -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. -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -23,7 +24,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 1e141b7768a..85ea592d950 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -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: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 79d54faf623..9fad6cc333e 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -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: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index 97638937c74..d6bd27758b4 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -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: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 211af70a854..40759cdc50b 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.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_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 7c4c534451d..80e73c43399 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -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: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index f2330322a5f..4c466e0c02b 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -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: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 8e4492c28a9..46a39b3c9e7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -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: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 39be52cf374..60641bf1876 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -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: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index e93ce9b4354..cfe126b5adf 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.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_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index baa01289b96..7e12e06beb7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -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: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index bd19d25f1a5..83eb804c875 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -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: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index eb95b9fe66c..6236e113766 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -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: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index 2c95fde3255..cf5121c34f9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -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: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index d62011351c4..cabdcce3a80 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index a07ff049d61..ebaf9582414 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index 730bc11ac98..fa9a85aac1f 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -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: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index 6f129f2feec..ec8931763bf 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -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: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 731cf8fb0f4..9c6e2a065f8 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -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: llx_commande.sql,v 1.14 2011/08/03 01:25:34 eldy Exp $ +-- $Id: llx_commande.sql,v 1.13 2011/07/28 22:22:31 eldy Exp $ -- =================================================================== create table llx_commande diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 172a2432ee1..7958b56f354 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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. -- --- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orphelins pour permettre mont�e de la cl� +-- Supprimme orphelins pour permettre monte de la cl -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index f1c8c7ac579..3ef51d6ae21 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -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: llx_commande_fournisseur.sql,v 1.8 2011/08/03 01:25:32 eldy Exp $ +-- $Id: llx_commande_fournisseur.sql,v 1.7 2011/07/28 22:22:31 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index c13c0aa6019..3f848c9ffe2 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index f0c65456e5c..df6d49827f6 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index be4e60a9a97..9bb45f9d326 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -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: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 23cfd068495..91914ab66c7 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -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: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b18165255..d1b39863cab 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -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: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index 19ec675f973..e964fbc2f5e 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -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: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a53a24d9a66..a747c714fb3 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.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_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 46639ca7c1e..16ecb365d6c 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.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_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index d1ba0645e05..bfce896eb19 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.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_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index b7fc52403af..51234007ee1 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.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_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index 4187f526393..eead2907fa2 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,9 +15,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_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 7b74d8b506d..1c757fa6c86 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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. -- --- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orhpelins pour permettre mont�e de la cl� +-- Supprimme orhpelins pour permettre monte de la cl -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index f1f4a75b604..79b52ba399c 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -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: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 39b89773316..3757e4522bf 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -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: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index 98b29b1f715..f5987250001 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -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: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 0eb566317d0..9c4a5e340ab 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 3fb9f7d6d2d..906d0a3e2f4 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index ba595100b5f..20bb329ff0e 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index b71d2697b85..2063a310fb8 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index 61d63046fac..a99b42859c7 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -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: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index 0e20201f4cb..f0e0a065089 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.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_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 154f0b51006..06af8a78575 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.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_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1dc4941012a..1c5d5c30173 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -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: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index a208aa5fff0..e43f4cb118c 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -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: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index f60029ee290..e4eb41f3bb4 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.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_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 2833920b746..463675b10b7 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -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: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index 7987ca819c1..fc998bd6edb 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.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_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index e027d471e23..1e9b0495d34 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -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: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ +-- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index 8b279dc578b..b899c4303e1 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.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_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 684c5aa5a7c..5d6d86617e6 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -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: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index cdccf3eb6ec..6de1b23eb64 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.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_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index fee45753759..04491e0878c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -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: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 9401f679071..575930a728c 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -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: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 757e8d2b447..46b769b8afc 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.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_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index d0118ebdc6c..e1b82141ea1 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 57d92bc8ce9..19824c860de 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 6f2ddcf56b9..455916a3010 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.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_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 6cf13137710..94e726796c5 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.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_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index cee3ace0ec3..8dbbb572f29 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -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: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 34d0bbac03b..923c2441987 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.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_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index ef97e48a251..88cf83a3cc3 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -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: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index b674a0cf11d..68e21d26061 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -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: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index 5e3620cba87..f289b9cb514 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -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: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index bd3c0c7d780..a2e54d34770 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -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: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index 1524eb7a77b..dbeec277f88 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -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: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index 75a4ce8fd06..e3e5900fb74 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.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_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index eafe6bd31e1..0669065b7d3 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -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: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index 6a06c0c70b5..dcca0174817 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -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: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index d4aa4b26d99..99cf1edd744 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.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_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index b55d734674f..415b44c6a35 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -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: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index 22a5b9d5c52..ba8b40b3c0a 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -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: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 5edbea4808d..40e131fefdf 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,9 +15,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_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index 5313952606a..bc11ca42c8f 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -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: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index c210f906b9b..8d4a4ecdcbf 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,9 +15,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_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index 29598bb4963..f43ab1e746a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.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_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index cfaad1061df..a52d3ed4a8b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -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: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 521d666742d..4e9f0d1da0e 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -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: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index 29af17f7c08..c9891219f4f 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,9 +15,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_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 917d6fc5cdf..6b8f7176dee 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -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: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 87245438b4d..399dd175311 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,9 +15,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_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index 373267c8921..c06074d4709 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,9 +15,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_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index b67427b9de8..1e3f21d0eb7 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.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_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 8f00ee95200..08450aa204f 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -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: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index edc76a392b0..9b0104ccfe5 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.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_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 302248ae299..0782e089170 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -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: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 9c741080a27..68b6cd9a315 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 4dd0ae15ad4..177be65fb88 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index ffc0666074d..d573c90eb18 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -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: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index 96f122e59cd..e0b2c2494ad 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -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: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 4beccac04b8..92000240642 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -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: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 484cebf6a2a..6240a2ed5c0 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -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: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index a56201f7dba..e2c4be38a5f 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -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: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 84f6077e5ba..51e133a86dc 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.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_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index 46685416239..aab9c69c1a7 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -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: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index 1d41d1ab59e..dc9732c0719 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -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: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index d6dd854a240..663adaffe60 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -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: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 0b7d6a61f56..73dc6489461 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -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: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index c1ee00edd07..0b42446740b 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.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_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index d694d696801..7d728850185 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -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: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index 925ca9eee81..d062249c3b8 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f67337de388..f33c92ea7fe 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 8c8454fbc28..92f21a35f28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.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_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index 6c673570cfc..e62275df23d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -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: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 9c05ed97a8d..29ad3853f90 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Oc�bo +-- Copyright (C) 2005 Marc Barilley / Ocbo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -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: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b127b194fa5..b9ba378d81f 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -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: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 5c8ea94ed09..8771b0ddda8 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.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_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 94ba92d4856..8bb011f7280 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.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_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 4017ae32682..1aba5d286d1 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -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: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index 2c77ae3447c..e0c4fd61701 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -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: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 52c0a3e2a03..1e721e86788 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.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_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index 439b2a68098..d4ea3ad5535 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.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_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index f01b7d02e8e..6f8d6a8cf97 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -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: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index bd1e805aed2..854ec6e826e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.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_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index bfc2162ceca..f1e90520593 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.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_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 784e3d37507..15d3bda5ba2 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -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: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 029bc528b6e..66a61851cae 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,9 +15,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_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 9c066c54436..195d2464738 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.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_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index f4e38524d25..44a301a2db7 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -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: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index f03d92ce651..237b5c23030 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.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_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 2c9c2d929db..3bec7551161 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index d9e9ecd43a7..45845593162 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql index f2bb73a1bda..612755ce349 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql @@ -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: llx_product_fournisseur.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id: llx_product_fournisseur.key.sql,v 1.3 2011/07/29 19:59:33 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 01cabfec865..672374961d5 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -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: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index 696cf49c337..d8d9443595d 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -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: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index 170bd56f390..f21fed4d1af 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -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: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index 5a3d71b489a..a501b4db4b6 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -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: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index d29449c2503..41a91a9aa5f 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.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_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index 86f114d395b..e12dbc6fb12 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -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: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index ce320558709..1a83bee6508 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -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: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 76f76ff08ed..93a28593f8e 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -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: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index 133687c7466..ec2bb01863b 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -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: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 6ccd3aa39fb..552a985abd4 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -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: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index e24a8918c5b..63b28ac8410 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -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: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index 26e451271cb..e7ccde53858 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -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: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index 40b07d29305..a1619df5cb5 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -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: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index e21669e63d7..309c60b660f 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.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_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index d094512d975..c92472f7af5 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -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: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index a75fb9aa76d..3fb70995900 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,9 +15,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_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ +-- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index a0d88737e3f..e7fc66a0ed6 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.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_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 9e28a37d6bb..57b252ed2ea 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -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: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index 376447586c9..b8453ea821c 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.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_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index e7528a03f28..00268974476 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -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: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 4f994cf57aa..16bf4dea7f0 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.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_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index 1a7fdfd755f..eff6387abee 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,9 +15,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_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index a618e3d8790..f53599483a4 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -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: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index 902f2b4fd5f..b9643f019c3 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.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_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index 1f5500e2eb1..db4cdd2581c 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -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: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index c7d84e27326..6bf45f749f5 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 523eb3b37e0..7db41de673c 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index bf057b4ad75..8dc4636c87e 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -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: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index ade6a40a80d..d500fc1b7cb 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.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_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index bca670bbb98..a515ba541bf 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -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: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index 7481589df00..b742b82dafc 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -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: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index 4adaa1a56ff..fff909a0ec8 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -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: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index 16631c76b76..fb65e9b7e84 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -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: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 3df14473a7e..332b1305d38 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.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_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index c3958313ea3..ca4206eb6fc 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -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: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 910d2ab2072..68e1d4f20e9 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -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: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 5c7f2e9a59c..8714e7e4a07 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -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: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index cbaadb10091..7d3b0eecd98 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.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_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index e88665b5a34..8bdd7193d1a 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -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: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 86916c216a2..367d45e8525 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -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: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 23065b261c8..28b28aeb762 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -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: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index 3f58eaf698b..d78db14c30b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -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: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 18924ff6ac5..68e46fd120d 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.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_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 8056a150fc3..6acb2db4585 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.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_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 1b5ea5516d4..838f502bfdb 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -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: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index e61985c7dd1..f21099e9c5e 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -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: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index 7bf81b7fbe9..f771be5ef5a 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.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_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 1fb0d708dfa..0033bca36bc 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.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_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 6df43634ec4..8037c9cd7e5 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -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: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 7b6cbd91645..99234b6660f 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index 810781ed6d9..dca8e80f856 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index 2e89f083575..f3a58aa1433 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.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_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index fd656c736ef..98c56c37567 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -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: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 87f6416c6c5..100d9fe82b0 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -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: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- ============================================================================ CREATE LANGUAGE plpgsql; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 9c4c3b41812..b588fe56702 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/upgrade2.php * \brief Upgrade some data - * \version $Id: upgrade2.php,v 1.187 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: upgrade2.php,v 1.186 2011/07/28 15:30:27 eldy Exp $ */ include_once('./inc.php'); diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html new file mode 100644 index 00000000000..38e0f007a15 --- /dev/null +++ b/htdocs/langs/es_ES/html/gpl.html @@ -0,0 +1,330 @@ + + + + + + + + +H. Licencia Pública GNU + + + + + + + + + + + + + +

                  Licencia Pública GNU

                  + + + + +
                  + +GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 + +
                  + +

                  Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, + MA 02139, USA.

                  +

                  Está permitido, a cualquier persona, copiar y distribuir copias tal cual de + este documento de licencia, sin la introducción de cualquier cambio. +

                  + +
                  +

                  Introducción

                  +

                  Las licencias de muchos softwares se desarrollan para asegurar la libertad + de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, + al contrario, pretende garantizar la libertad de compartir y alterar softwares + de libre distribución - volviéndolos de libre distribución también para cualquier + de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares + de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla + (algunos softwares de la FSF son cubiertos por la GNU Library General Public + License).

                  +

                  Cuando nos referimos a softwares de libre distribución, nos referimos a la + libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar + la libertad de distribución de copias de softwares de libre distribución (y + cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos + fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se + hacen algunas restricciones, para asegurar los derechos de los programadores, + prohibiendo a todas las personas su negación o la solicitación de su abdicación. + Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución + o modificación del software.

                  +

                  Por ejemplo, al distribuirse copias de determinado programa, por una tasa + determinada o gratuitamente, se debe informar sobre todos los derechos incidentes + sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia + Pública General GNU.

                  +

                  La protección de los derechos envuelve dos pasos: (1) copyright del software + y (2) licencia que da permiso legal para copia, distribución y/o modificación + del softwares.

                  +

                  Aún para la protección de la FSF y del autor es importante que todos entiendan + que no hay garantías para softwares de libre distribución. Si software se modifica + por alguien y lo pasa adelante, este software no más reflejará el trabajo original + del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                  +

                  Finalmente, cualquier programa de libre distribución está constantemente amenazado + por las patentes de softwares. Buscamos evitar el peligro de que distribuidores + de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. + Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación + de patente se debe hacer permitiendo el uso por cualquier individuo, sin la + necesidad de licencia de uso.

                  +

                  Los términos y condiciones precisas para copia, distribución y modificación + siguen abajo:

                  +
                  +

                  Licencia Pública General GNU

                  +

                  TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN +

                  + +
                    + +

                  1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga + un aviso colocado por el detentor de los derechos de autor diciendo que aquel + podrá ser distribuido en las condiciones de la Licencia Pública General. El + Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado + en un Programa y significa tanto el propio Programa, como cualquier de los + trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, + un trabajo que contenga el Programa o una parte de este, en su forma original + o con modificaciones o traducido para una otra lengua (la traducción está + incluida sin limitaciones en el término ``modificación'').

                    +

                    Actividades distintas de copia, distribución y modificación no están cubiertas + por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa + no está restringido y la salida del Programa está cubierta solamente en + el caso de que su contenido contenga trabajos basados en el Programa (independientemente + de que hayan sido creados por la ejecución del Programa). Si esto es así, + depende de las funciones ejecutadas por el Programa.

                    2. + +

                  2. El código fuente del Programa, de la forma como fue recibido, puede ser + copiado y distribuido, en cualquier media, desde que sea providenciado un + aviso adecuado sobre los copyrights y la negación de garantías, y todos los + avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, + estén inalterados y que cualquier producto oriundo del Programa esté acompañado + de esta Licencia Pública General.

                    +

                    Está permitido el cobro de tasas por el acto físico de transferencia o + grabación de copias, y pueden ser dadas garantías y soporte en cambio del + cobro de valores.

                    3. + + +
                  3. +

                    Se puede modificar la copia o copias del Programa de cualquier forma que + se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir + tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                    + +
                      +

                    1. Debe existir un aviso destacado de que los datos originales fueron alterados + en los archivos y las fechas de los cambios;

                      2. + +

                    2. Debe existir un aviso de que el trabajo distribuido o publicado es, + de forma total o parcial, derivado del Programa o de alguna parte suya, + y que puede ser licenciado totalmente sin costes para terceros bajo los + términos de esta Licencia.

                      3. + +

                    3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, + en el inicio de tu ejecución, presentar la información de copyright y + de ausencia de garantías (o de que la garantía es de responsabilidad de + terceros), y que los usuarios pueden redistribuir el programa bajo estas + condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                      4. +
                    + + Estos requisitos se aplican a trabajos de modificación en general. Si + algunas secciones identificables no sean derivadas del Programa, y pueden + ser consideradas como partes independientes, entonces esta Licencia y sus + Términos no se aplican a aquellas secciones cuando distribuidas separadamente. + Pero al distribuir aquellas secciones como parte de un trabajo basado en + el Programa, la distribución, como un todo, debe contener los términos de + esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no + a cada una de las partes independientemente de quem los tenga desarrollado. + Más que tener intención de contestar los derechos sobre el trabajo desarrollado + por alguien, esta sección objetiva propiciar la correcta distribución de + trabajos derivados del Programa. + Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado + en él ni a un trabajo basado en él, a un volumen de almacenaje o media de + distribución no obliga la utilización de esta Licencia y de sus términos + al trabajo. +
                    4. + + +
                  4. +

                    Están permitidas, la copia y la distribución, del Programa (o un trabajo + basado en éste) en la forma de código objeto o ejecutable de acuerdo con los + términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                    + +
                      +

                    1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos + en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada + para manejo de softwares o

                      +
                      2. +

                    2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, + de poner a disposición a terceros, por un coste no superior al coste del + medio físico de almacenaje, una copia completa de los códigos fuente en + medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                      +
                      3. +

                    3. Esté acompañada con la misma información recibida en relación con la + oferta de la distribución del código fuente correspondiente (esta alternativa + solamente está permitida para distribuciones no comerciales y solamente + si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, + de acuerdo con la sección 2 arriba).

                      +
                      4. +
                    + El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones + en aquel trabajo. Cuando se habla en códigos fuentes completos significa + hablar de todos los fuentes de todos los módulos, además de las definiciones + de interfaces asociadas, archivos, scripts utilizados en la compilación + y instalación del ejecutable. Como una excepción excepcional, el código + fuente distribuido podrá no incluir algunos componentes que no se encuentren + en su escopo, como compilador, kernel, etc... para el SO donde el trabajo + sea ejecutado. + Si la distribución del ejecutable o objeto se hace, a través de acceso + a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente + de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos + con los objetos simultáneamente +
                    5. + +
                  5. +

                    No está permitida la copia, modificación, sublicenciamiento o distribución + del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier + tentativa de copia, modificación, sublicenciamiento o distribución del Programa + está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. + Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, + no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas + de esta Licencia.

                    6. +
                  6. +

                    No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá + documento o contrato que garantice permiso de modificación o distribución + del Programa o sus trabajos derivados. Estas acciones están prohibidas por + ley, en el caso de que no se acepten las condiciones de esta Licencia. La + modificación o distribución del Programa, o cualquier trabajo basado en éste, + implica en la aceptación de esta Licencia y de todos los términos de ésta + para copia, distribución o modificación del Programa o trabajos basados en + éste.

                    7. +
                  7. +

                    Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), + el recipiente automáticamente recibe una licencia del detentor original de + los derechos de copia, distribución o modificación del Programa objeto de + estos términos y condiciones. No pueden ser impuestas otras restricciones + en los recipientes.

                    8. + +
                  8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes + o derechos de autor, se impongan restricciones, que contradigan esta Licencia, + estos no exentan de su aplicación. Si no es posible distribuir el Programa + de forma a garantizar simultáneamente las obligaciones de esta Licencia y + otras que sean necesarias, entonces el Programa no podrá ser distribuido. +

                    Si esta Sección se considera, inválida por cualquier motivo particular + o general, su resultado implicará en la invalidación general de esta licencia + en la copia, modificación, sublicenciamiento o distribución del Programa + o trabajos basados en éste.

                    +

                    El propósito de esta sección no es, de forma alguna, incitar a quien quiera + que sea a infringir derechos reclamados en cuestiones válidas y procedentes, + y si proteger las premisas del sistema de libre distribución de software. + Muchas personas tienen hecho contribuciones generosas al sistema, en la + forma de programas, y es necesario garantizar la consistencia y credibilidad + del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución + de los softwares.

                    +

                    Esta sección pretende hacer claro los motivos que crearan las demás cláusulas + de estas Licencia.

                    9. + +
                  9. +

                    Si la distribución del Programa, dentro de los términos de esta Licencia, + tiene restricciones en algún País, por patentes o derechos de autor, el detentor + original de los derechos de autor del Programa bajo esta Licencia puede adicionar + explícitamente limitaciones geográficas de distribución, excluyendo aquellos + Países, haciendo con que la distribución solamente sea posible en los Países + no excluidos.

                    10. + +
                  10. +

                    La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) + puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública + General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos + objetivos y el espirito de la presente versión, pudiendo variar en detalles + referentes a nuevas situaciones encontradas.

                    +

                    A cada versión se da un número distinto. Si el Programa especifica, un + número de versión determinado de esta Licencia, que tenga en su contenido + la expresión ``o versión más actualizada'', es posible optar por las condiciones + de aquella versión o de cualquier versión más actualizada publicada por + la FSF.

                    11. + +
                  11. +

                    Si deseas incorporar parte del Programa en otros programas de libre distribución + de softwares hace falta autorización formal del autor. Para softwares que + la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde + que mantenido el espirito y objetivos originales de esta Licencia.

                    12. +
                  + +

                  AUSENCIA DE GARANTÍAS

                  +
                    +

                  1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER + GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE + EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS + DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, + LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD + Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS + CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y + REPAROS JUZGADOS NECESARIOS.

                    2. +

                  2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR + LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN + RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE + HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS + O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES + O DAÑOS.

                    +

                    FIN DE LA LICENCIA

                  + + +
                  +

                   

                  +

                  Apéndice

                  +

                  ¿Cómo aplicar estos términos a nuevos softwares?

                  +

                  Si has desarrollado un nuevo programa y deseas su amplia distribución para + el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, + que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                  +

                  Para esto basta con anexar este aviso al programa. Se recomienda indicar aún + en el inicio de cada archivo fuente la ausencia de garantías y una anotación + de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                  +

                  <nombre del programa y función> Copyright (C) 199X <Autor> +

                  +

                  Este programa es un software de libre distribución, que puede ser copiado + y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo + con la publicada por la Free Software Foundation, versión 2 de la licencia o + (a criterio del autor) cualquier versión posterior.

                  +

                  Este programa se distribuye en la expectativa de ser útil a sus usuarios, + pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE + ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General + 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. +

                  +

                  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:

                  +

                  Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares + NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software + de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. + Teclea 'muestra condic' para mayores detalles.

                  +

                  Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las + partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos + pueden variar o pueden ser accionados por otras interfaces como clic de ratón, + etc...

                  +

                   

                  +
                  +
                  + +www.conectiva.com + +
                  + + + + + diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt new file mode 100644 index 00000000000..3efbe1ccee7 --- /dev/null +++ b/htdocs/langs/nl_BE/html/gpl.txt @@ -0,0 +1,340 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +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 new file mode 100644 index 00000000000..778e2b02b41 --- /dev/null +++ b/htdocs/langs/nl_NL/html/gpl.txt @@ -0,0 +1,339 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van +deze licentie. \ No newline at end of file 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/ajax.lib.php b/htdocs/lib/ajax.lib.php index 55def736688..7db1908bc49 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ */ diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index e2a33296bee..263e18df269 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -16,7 +16,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ @@ -24,7 +25,7 @@ * \file htdocs/lib/pdf.lib.php * \brief Set of functions used for PDF generation * \ingroup core - * \version $Id: pdf.lib.php,v 1.99 2011/07/31 23:25:42 eldy Exp $ + * \version $Id: pdf.lib.php,v 1.98 2011/07/27 17:28:42 eldy Exp $ */ diff --git a/htdocs/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/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index d6bf7267439..454073d9730 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 6e1e7b262f4..b5304ba4198 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index b0a7c2dece6..bda35165079 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.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/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ + * \version $Id$ */ if (session_id() == "") session_start(); 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/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index e78dff8f646..f93935ffb16 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.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/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ + * \version $Id$ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal 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 $'); ?> From 89b22409fda08d93bbb081abf26857010a46ab39 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 00:45:22 +0000 Subject: [PATCH 053/118] Fix: Avoid errors into rpm packages --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/control.DEBIAN | 46 - build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 + build/deb/install | 1 + build/deb/po/fr.po | 22 +- build/deb/po/templates.pot | 20 +- build/deb/postinst | 100 +- build/deb/postrm | 119 +- build/deb/templates | 7 + build/makepack-dolibarr.pl | 36 +- build/rpm/README | 10 +- build/rpm/dolibarr.desktop | 3 +- build/rpm/dolibarr.spec | 27 +- build/rpm/file_contexts.dolibarr | 6 +- dev/skeletons/modMyModule.class.php | 4 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 35 +- htdocs/admin/perms.php | 34 +- htdocs/admin/proxy.php | 7 +- htdocs/admin/security_other.php | 7 +- htdocs/admin/system/constall.php | 5 +- htdocs/boutique/index.php | 10 +- htdocs/boxes.php | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/tpl/menu.tpl.php | 13 +- htdocs/cashdesk/tpl/validation1.tpl.php | 21 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/compta/prelevement/create.php | 7 +- htdocs/core/class/html.form.class.php | 11 +- htdocs/core/class/interfaces.class.php | 5 +- htdocs/filefunc.inc.php | 7 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 ++++++++--------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/index.php | 7 +- htdocs/install/default.css | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- .../install/mysql/data/llx_c_currencies.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/data/llx_c_tva.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_departements.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_regions.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- htdocs/install/mysql/tables/llx_commande.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../mysql/tables/llx_commande_fournisseur.sql | 5 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/install/upgrade2.php | 5 +- htdocs/langs/es_ES/html/gpl.html | 330 ------ htdocs/langs/nl_BE/html/gpl.txt | 340 ------ htdocs/langs/nl_NL/html/gpl.txt | 339 ------ htdocs/lib/admin.lib.php | 77 +- htdocs/lib/ajax.lib.php | 5 +- htdocs/lib/pdf.lib.php | 5 +- htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 5 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- htdocs/societe/soc.php | 10 +- .../smartphone/theme/default/default.css.php | 5 +- htdocs/user/group/perms.php | 34 +- htdocs/user/perms.php | 32 +- 341 files changed, 1586 insertions(+), 2715 deletions(-) delete mode 100755 build/deb/control.DEBIAN delete mode 100644 htdocs/langs/es_ES/html/gpl.html delete mode 100644 htdocs/langs/nl_BE/html/gpl.txt delete mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index edb46ffd5a3..d73d7a99219 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build package +# dpkg -b To build binary only package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# +# dpkg-reconfigure -plow package Reconfigure package # dpkg -L packagename List content of installed package +# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index b035f18ae1d..3382966714b 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 + -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN deleted file mode 100755 index 7c66775bdf1..00000000000 --- a/build/deb/control.DEBIAN +++ /dev/null @@ -1,46 +0,0 @@ -Package: dolibarr -Version: __VERSION__ -Architecture: all -Maintainer: Laurent Destailleur -Installed-Size: 61200 -Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl -Section: web -Priority: optional -Homepage: http://www.dolibarr.org -Description: Easy to use web based ERP & CRM software - Dolibarr ERP & CRM is an easy to use open source/free software for small - and medium companies, foundations or freelances. It includes different - features for Enterprise Resource Planning (ERP) and Customer Relationship - Management (CRM) but also for different other activities. - It's a web software you can install as a standalone program or on any web - hosting provider to use it from anywhere with any web browser. - Dolibarr was designed to provide only features you need and be easy to use. - . - Only features you need are visible, depending on which module were activated. - Most common used modules are: - . - Customers, Suppliers or Prospects directory, - Contacts directory, - Orders management, - Commercial proposals management, - Invoices management, - Products and services catalog, - Stock management, - Foundations members management, - Bank accounts management, - Point of Sale, - Payments management, - Commercial actions management, - Contracts management, - Standing orders management, - Shipping management, - Donations management, - Bookmarks management, - Mass Emailings, - Reports, - Wizards to export and import data, - LDAP connectivity, - PDF exports, - And a lot of more modules... - . - You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index 91f0705c001..e28258d8dbc 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,10 +4,16 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper, po-debconf +Build-Depends: debhelper (>= 7), po-debconf Package: dolibarr -Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, + php5-mysql | php5-mysqli, + php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, + ${misc:Depends}, xdg-utils, + mysql-server, perl +Recommends: apache2 | lighttpd | httpd, mysql-client +Suggests: www-browser Architecture: all Section: web Priority: optional diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index a48e5048dff..f4b471edf13 100644 --- a/build/deb/dolibarr.desktop +++ b/build/deb/dolibarr.desktop @@ -3,10 +3,14 @@ # It must be saved into directory /usr/share/applications Version=1.0 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM +Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations +Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/deb/install b/build/deb/install index 4d41fd52c65..2928d378abc 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,4 +1,5 @@ etc/dolibarr/apache.conf +etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 13b8030ed0d..3bbe762283a 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:49+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,10 +25,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "Seveur web à reconfigurer automatiquement:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" +"Selectionnez le serveur web à configurer automatiquement pour utiliser " +"dolibarr." + # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -36,7 +52,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index 32c92a97cc4..d65e5d8b7f6 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:52+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,15 +17,29 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: multiselect #. Description #: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:2001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index ca5fd1645dd..e0bba1be4da 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,7 +1,5 @@ #!/bin/sh # postinst script for dolibarr -# -# see: dh_installdeb(1) set -e @@ -16,6 +14,31 @@ set -e # for details, see /usr/share/doc/packaging-manual/ + + +lighttpd_install() { + if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + if which lighty-enable-mod >/dev/null 2>&1 ; then + echo "Add link for Lighttpd config file" + ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf + # We enabled it + lighty-enable-mod dolibarr fastcgi-php + else + echo "Lighttpd not installed, skipping" + fi + fi +} + +apache_install() { + webserver=$1 + if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Add link for Apache config file" + ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + . /usr/share/debconf/confmodule db_version 2.0 @@ -27,8 +50,6 @@ 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" @@ -44,10 +65,6 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir - # Copy apache.conf file into target directory - #mkdir -p /etc/dolibarr - #cp -p $apachefileorig $apacheconfig - # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -74,21 +91,15 @@ case "$1" in chmod -R 660 $config fi - # Get the web server type (use db_get for interactive mode). - #db_reset "dolibarr/webserver" - #db_get "dolibarr/webserver" # Read value for webserver. - #webserver="$RET" - - case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; - esac - + + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + # Set up web server. - for server in $webservers ; do - echo Complete config of server $server + for webserver in $webservers ; do + webserver=${webserver%,} + echo Complete config of server $webserver # Detect webuser and webgroup webuser= @@ -106,26 +117,31 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config - - # Add link to config file - echo Setup web server $server to add dolibarr config file - ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf - done - # Restart servers - servers="apache2-ssl apache2 mysql" - # Another way to restart - for server in $servers ; do - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $server reload || true - else - echo Restart web server $server using $server reload - /etc/init.d/$server reload || true - fi + # Restart web server. + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_install + else + apache_install $webserver + fi + # Reload webserver in any case, configuration might have changed + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $webserver reload 3>/dev/null || true + else + echo Restart web server $server using $server reload + /etc/init.d/$webserver reload 3>/dev/null || true + fi + fi done + echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -136,13 +152,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument $1" >&2 exit 0 ;; esac -db_stop - #DEBHELPER# +db_stop + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 9eae81b022b..27ce3777b7e 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,7 +17,36 @@ set -e # for details, see /usr/share/doc/packaging-manual/ -. /usr/share/debconf/confmodule + +lighttpd_remove() { + if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + echo "Remove link for Lighttpd config file" + rm -f /etc/lighttpd/conf-available/50-dolibarr.conf + if which lighty-enable-mod >/dev/null 2>&1 ; then + lighty-disable-mod dolibarr + else + echo "Lighttpd not installed, skipping" + fi + # See bug #448682 + if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then + echo 'Manually deleting lighttpd/dolibarr configuration link' + rm /etc/lighttpd/conf-enabled/50-dolibarr.conf + fi + fi +} + +apache_remove() { + if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Remove link for Apache config file" + rm -f /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi db_version 2.0 @@ -26,63 +55,62 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' -apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" -apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" -export webserver="" -# Allows us to loop and substitute in one pass -case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; -esac - case "$1" in # Call when we upgrade upgrade) + echo "postrm upgrade" ;; # Call when we uninstall remove) + echo "postrm remove" rm -f $lockfile - # 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" + # Reconfigure web server + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + + # Restart web servers + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_remove + else + apache_remove $webserver + fi + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload 3>/dev/null || true + else + /etc/init.d/$webserver reload 3>/dev/null || true + fi fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" + echo "postrm purge" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical "dolibarr/postrm" || true + db_input critical dolibarr/postrm || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get "dolibarr/postrm" + db_get dolibarr/postrm set -e if [ "$RET" = "true" ] ; then @@ -185,41 +213,12 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi - # Remove include files - export restart="" - for server in $webservers ; do - export conffile="/etc/$server/conf.d/dolibarr.conf" - if [ -f $conffile ] ; - then - echo Delete file $conffile - rm -f $conffile - status=purge - fi - - if [ "x$status" = "xpurge" ] ; - then restart="$restart $server" - fi - done - rm -rf /etc/dolibarr - # Restart servers - for server in $restart ; do - # We disable blocking errors - set +e - echo "Restart server $server if exists" - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $server reload || true - else - /etc/init.d/$server reload || true - fi - # We restore blocking errors - set -e - done - # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset "dolibarr/postrm" + db_reset dolibarr/reconfigure-webserver + db_reset dolibarr/postrm set -e #db_purge @@ -229,7 +228,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "postrm called with unknown argument $1" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index 5c06afd8ccd..b96325a4e64 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,3 +1,10 @@ +Template: dolibarr/reconfigure-webserver +Type: multiselect +Choices: apache2, lighttpd +_Description: Web server to reconfigure automatically: + Please choose the web server that should be automatically configured + to run dolibarr. + Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index d3c47e6b28d..20c5ba415e9 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.129 2011/08/01 18:22:26 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -318,6 +318,9 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; } # Build package for each target @@ -569,6 +572,8 @@ if ($nboftargetok) { if ($target eq 'DEB') { + $olddir=getcwd(); + $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -671,19 +676,22 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache conf files + # Apache and lighttpd conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - - # Dolibarr conf files - # TODO + print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -729,17 +737,15 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - print "Go to directory $BUILDROOT\n"; - $olddir=getcwd(); - chdir("$BUILDROOT"); - - # Creation of binary package (to build without sources) + # Creation of binary package (to build without sources) + #print "Go to directory $BUILDROOT\n"; + #chdir("$BUILDROOT"); #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Creation of source package + # Prepare source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -751,6 +757,7 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; + $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -766,6 +773,9 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; + + # Creation of source package + print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/build/rpm/README b/build/rpm/README index 99a1bb3552c..c157a195c03 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -10,8 +10,6 @@ with format RPM (for Redhat, Mandriva, ...). # This is standard command to work on Debian packaging: # -# rpmlint file.rpm Test a package -# # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies @@ -42,9 +40,7 @@ different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. I am author of other already packaged OpenSources packages (awstats) but this is my first package to maintain myself. So i'm seeking a sponsor. + - Edit field "Block" and add FE-NEEDSPONSOR -- Check bug is into database by searching with id on https://bugzilla.redhat.com/ -- Install fedora packager tools: yum install fedora-packager -- Setup fedora packagers tools: fedora-packager-setup -- Send your package: koji build --scratch f16 path_to_source_RPM -- Check if package is available: http://koji.fedoraproject.org/koji/ \ No newline at end of file + +- Check bug is into database by searching with id on https://bugzilla.redhat.com/ \ No newline at end of file diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index 4b4fb60dadb..337b92d8049 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -4,13 +4,14 @@ Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti -Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 708546cf263..1754220c6c7 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -48,7 +48,7 @@ AutoReqProv: no %description -An easy to use CRM & ERP open source/free software for small +Dolibarr ERP & CRM is an easy to use open source/free software for small and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. @@ -56,7 +56,7 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Un software ERP y CRM open source/gratis para pequeñas y +Dolibarr ERP y CRM es un software open source/gratis para pequeñas y medianas empresas, asociaciones o autónomos. Incluye diferentes funcionalidades para la Planificación de Recursos Empresariales (ERP) y Gestión de la Relación con los Clientes (CRM) así como para para otras @@ -65,13 +65,13 @@ solamente las funcionalidades que necesita y haciendo hincapié en su facilidad de uso. %description -l fr -Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, +Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, artisans ou associations. Il permet de gérer vos clients, prospect, fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Un programma gestionale open source e gratuito per piccole e medie +Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno @@ -101,7 +101,6 @@ 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 cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -154,8 +153,6 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr" -export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="%{_sysconfdir}/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" @@ -221,7 +218,7 @@ then chmod -R 660 $config fi -# Create config file for apache $apacheconfig +# Create a config file $apacheconfig if [ ! -f $apacheconfig ]; then echo Create dolibarr web server config file $apacheconfig cp $apachefileorig $apacheconfig @@ -229,15 +226,7 @@ if [ ! -f $apacheconfig ]; then chmod go-w $apacheconfig fi -# Create config file for se $seconfig -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 +# Create a config link dolibarr.conf for Fedora or Redhat if [ ! -f $apachelink ]; then echo Create dolibarr web server config link $apachelink ln -fs $apacheconfig $apachelink @@ -370,5 +359,5 @@ rmdir $targetdir/doc >/dev/null 2>&1 #rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm %changelog -* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 -- Initial version (#723326) +* Wed Jul 31 2011 Laurent Destailleur 3.1.0 +- Initial upstream (#723326) diff --git a/build/rpm/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr index 64376e5afb6..193a43b7dbe 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -1,3 +1,3 @@ -/etc/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/var/www/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file +/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/var/www/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 3cc548e1c0a..d7172d651f0 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -27,7 +27,7 @@ * \file htdocs/includes/modules/modMyModule.class.php * \ingroup mymodule * \brief Description and activation file for module MyModule - * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $ + * \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); @@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='generic'; - // Defined if the directory /mymodule/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 718c842d046..34e7f48cea8 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -20,7 +20,7 @@ /** * \file htdocs/admin/boxes.php * \brief Page to setup boxes - * \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $ */ require("../main.inc.php"); @@ -278,7 +278,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -394,7 +394,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -470,5 +470,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $'); +llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $'); ?> diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index a907f47663a..671bd69a0e4 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2010 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ /** * \file htdocs/admin/modules.php * \brief Page to activate/disable all modules - * \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $ */ require("../main.inc.php"); @@ -79,12 +79,35 @@ $modules = array(); $orders = array(); $categ = array(); $dirmod = array(); +$modulesdir = array(); $i = 0; // is a sequencer of modules found $j = 0; // j is module number. Automatically affected if module number not defined. -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $althandle=@opendir($dirroot); + if (is_resource($althandle)) + { + while (($file = readdir($althandle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                  "; dol_syslog("Scan directory ".$dir." for modules"); @@ -449,5 +472,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $'); +llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $'); ?> diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index bee00b52906..6af9b54e7f0 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -21,7 +21,7 @@ * \file htdocs/admin/perms.php * \ingroup core * \brief Page d'administration/configuration des permissions par defaut - * \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $ + * \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $ */ require("../main.inc.php"); @@ -76,10 +76,34 @@ $db->begin(); // Charge les modules soumis a permissions $modules = array(); -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +$modulesdir = array(); +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                  "; $handle=@opendir($dir); @@ -194,5 +218,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $'); +llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $'); ?> diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 2c284c5cae8..f02e3d6203a 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ + * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -205,5 +206,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c1d629f7b7b..c0aaaa86213 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -347,5 +348,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index f478b65e3a8..a07b28bd2cf 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/system/constall.php * \brief Page to show all Dolibarr setup (config file and database constants) - * \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $ + * \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $ */ require("../../main.inc.php"); diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php index a0d12d3457c..17a59229716 100644 --- a/htdocs/boutique/index.php +++ b/htdocs/boutique/index.php @@ -17,10 +17,10 @@ */ /** - * \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: index.php,v 1.16 2011/08/03 00:45:46 eldy Exp $ */ require("../main.inc.php"); @@ -238,5 +238,5 @@ print ''; $dbosc->close(); -llxFooter('$Date: 2011/08/03 01:17:17 $ - $Revision: 1.17 $'); +llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.16 $'); ?> diff --git a/htdocs/boxes.php b/htdocs/boxes.php index 2affdf654d3..d426e618377 100644 --- a/htdocs/boxes.php +++ b/htdocs/boxes.php @@ -22,7 +22,7 @@ * \brief File of class to manage widget boxes * \author Rodolphe Qiedeville * \author Laurent Destailleur - * \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $ */ @@ -220,7 +220,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php"); + $sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); } else { @@ -281,7 +281,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index c79d46fbeb5..698cceb4966 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,11 +11,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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ -/* \version $Id$ */ +/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index f91946e11c0..2d89cfd2388 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.js @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ // Instanciation et initialisation de l'objet xmlhttprequest diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 83dac68a99e..8b82c9f8249 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); @@ -63,11 +62,13 @@ $logout=''; print '
                    '; +// Link to new sell print '
                  • '.$langs->trans("NewSell").'
                    • '; - -print '
                  • '.$langs->trans("BackOffice").'
                    • '; - -print '
                  • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' '.$logout.'
                    '; +// Open new tab on backoffice (this is not a disconnect from POS) +print '
                  • '.$langs->trans("BackOffice").'
                    • '; +// Disconnect +print '
                  • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom']; +print ' '.$logout.'
                    '; print $langs->trans("CashDeskThirdParty").': '.$companyLink.'
                    '; /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'
                    '; print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'
                    '; diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index f3a440b4929..b18bf124ae4 100644 --- a/htdocs/cashdesk/tpl/validation1.tpl.php +++ b/htdocs/cashdesk/tpl/validation1.tpl.php @@ -15,8 +15,7 @@ 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, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with this program. If not, see . -->
                    trans("Summary"); ?> @@ -40,9 +39,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ?> trans("TotalTTC"); ?> prix_total_ttc(),'MT').' '.$conf->monnaie; ?> trans("PaymentMode"); ?> - mode_reglement()) - { + { case 'ESP': echo $langs->trans("Cash"); $filtre='courant=2'; @@ -53,7 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 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"); @@ -65,16 +64,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. echo $langs->trans("Reported"); $filtre='courant=1 OR courant=2'; $selected=''; - break; + break; default: $filtre='courant=1 OR courant=2'; $selected=''; } - + ?> - - mode_reglement() == 'DIF' ) { @@ -100,10 +99,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

                    - 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/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 259dc4dbce5..96de90124f9 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -48,7 +47,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -67,7 +66,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -78,17 +77,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 0c262ba2936..5ba2ef8997e 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -385,5 +386,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 525160df9ef..9ee1f551048 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ + * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -607,5 +608,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index e05eaa66ecf..0efb704828f 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ + * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -1032,5 +1031,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index d2f2a7aae7e..5da397b4183 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ + * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ */ require('../main.inc.php'); @@ -673,5 +672,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); +llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); ?> diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 79d00ae00c7..689e2639773 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ + * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -275,5 +276,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); +llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index cb4a0f7a5cf..e24b3c7c717 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -23,15 +23,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $ + * \version $Id: html.form.class.php,v 1.193 2011/07/31 23:45:14 eldy Exp $ */ @@ -161,8 +160,10 @@ class Form $htmltext=str_replace("\n","",$htmltext); $htmltext=str_replace('"',""",$htmltext); - $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip - $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip + else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip + else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag $s=""; if (empty($notabs)) $s.=''; diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 8deeda0fb57..2ca2f82789e 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/interfaces.class.php * \ingroup core * \brief Fichier de la classe de gestion des triggers - * \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $ + * \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $ */ diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 3148174f5af..13a97bf54b3 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,14 +20,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -64,7 +65,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 257b95e4e3c..6f6c7ed2a1b 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -65,7 +64,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.30 $'); + $ver=explode(' ','$Revision: 1.31 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 127eb16e389..446606ef055 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -64,7 +63,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
                    This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.27 $'); + $ver=explode(' ','$Revision: 1.28 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 9c90d1fcc94..46fa4c9ccc4 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,9 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* or see http://www.gnu.org/ +* along with this program. If not, see . */ /** @@ -22,7 +20,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id$ + * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -61,7 +59,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
                    This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision$'); + $ver=explode(' ','$Revision: 1.14 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index ec7e1af07c6..7055bef4b69 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php index 42780551928..c7bab37ad4b 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.10 2011/07/31 23:28:10 eldy Exp $ + * \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis 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/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 1; // Data directories to create when module is enabled diff --git a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index b1e3f5a2638..067e831b0b4 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,504 +1,503 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; If not, see . + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index b1e3f5a2638..e5f0ff4c0e5 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + License along with this library; If not, see . Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/index.php b/htdocs/index.php index f027e94a35a..5998094d362 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -573,7 +574,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); +llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); /** diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 9978c8f437a..1d2084e7c7f 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: default.css,v 1.24 2011/08/03 01:32:42 eldy Exp $ */ body { diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 9d08a56e41c..275298588e2 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index 56ceea3d807..da244f79951 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index 3a248c2f49f..eee5dfa185a 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index dcbaf2faaf4..e3922b97f65 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index 1dd3cb59a62..b7f6c71c87e 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,10 +11,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index 5e93e39d048..f3299990858 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index e3ed8196d17..1f14cc8c142 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 176e5c796e2..5017ce0c60d 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql index ad7c175fcc4..eeb2c376b85 100644 --- a/htdocs/install/mysql/data/llx_c_currencies.sql +++ b/htdocs/install/mysql/data/llx_c_currencies.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_c_currencies.sql,v 1.8 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index db630463dbf..f58db2b32a6 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index c67d263853d..079caa7dde4 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 07fa2abaa83..4bb81528e74 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index e29b3f306f5..720413ac480 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index c7fa6b6dd1f..cb0b557b438 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index 6a597996424..a3a19cc2125 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 78e174b9817..1ec498e6bc2 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a535a5098e..3a17978bb0c 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index f6395abbfcd..96d456312df 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 9c28f697f83..488b0a564eb 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index 988d9c26136..d8701c52c01 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ -- -- @@ -34,4 +33,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2d1a3c62a39..2fd47385a90 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 056dbdbdb6e..788e9e82f39 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_c_tva.sql,v 1.27 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index 4238000eb14..da98640fd25 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 6e596be24e5..789ad16fce2 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index e2faed3cba3..48b77951e1f 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index cf7e9e96275..59bd3d1ef00 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index 655848a50ae..cd2f27a5dca 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 968a131e2bb..42f86f1c447 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 6e6e960072b..685170362fd 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 02ff06ba9f1..921bc569980 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index f22262c9353..d5902b539c7 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index b2cdf08af5f..ddd3d734ff7 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 031bfb614e1..8c5c23bbe62 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index 3aa9555979e..f7b876eed86 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 4703aa32ddd..8d34e2a9c78 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index 69bf706ca68..ad6f448e3dc 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 9156b439833..51d66c04584 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index db64e0cbf9c..7df7f21a3b9 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index a7efcbd0f6d..31676d7d6e2 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index 7e4fa074e71..bc9d9ad0936 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index d23a1367f92..18eed730ab8 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index 2b2db5af657..ade41da746e 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index b5c9175202b..62a88236480 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 6ed1e00dd88..015a9e9b4c0 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index d1279c21eb2..296b49fc93f 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 822a69bc4ec..9cedf70e7ca 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index aba765190ee..55718d8ffb5 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index eded16c49fe..abc9baa2d8c 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index e39fbf71f12..3dd83585bcd 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 3710a87470a..217edcaddbb 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index ad41449f288..5869f24d8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index f6301a24919..5db17f19069 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index cd68a9cdb40..5f66ff625f0 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index 890c7597862..b0546729ef0 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index d67cf7fe4b8..4794113f8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5c06c73c69d..5fc25f57339 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 115bd310d70..5746cce26aa 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index d3c71cc4a70..ba1e56e2b94 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index 10c4cc2d853..de9c23e9c05 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,11 +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, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- --- $Id$ +-- $Id: llx_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index 09365976d78..cce9d04707b 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 463b1235094..93e8e3d99a7 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index c81a2b3e830..b0f31fe7116 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index 821fe3e5c04..cb2251cfaf6 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 9380607010d..8bebcf13116 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index e524d9c937a..b30354cae19 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index 0b0b34390c4..b026a40d762 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 7b5fa661d7d..39d21cee7b9 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index e2f225fe608..d1e6b216b4b 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 66cd5111325..60af7723f30 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index ebca12ab5da..cb223ae5532 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 3872bedd39d..415b8526793 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index bed4ad41dfc..5c54695f608 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 23cd0f575ed..93ef5d59770 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index f46d2a56c33..7702a8cf21e 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_departements.sql b/htdocs/install/mysql/tables/llx_c_departements.sql index ab0ea5dc0c3..ea1f7543428 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_departements.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ +-- $Id: llx_c_departements.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_c_departements diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 4669de108f4..46a35567e95 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index a6bb8ca70f7..c2c43a3a625 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 5637e5a987d..547500d7f33 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index 884d8274cfd..bf7ed18af80 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index 2b6dea6cbd3..d0dceaf0fe1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 76aecebbb9a..192183be0c1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index 665a210d74b..d6d673962b9 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index 7fcd57e31eb..c8deefef6d7 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index e1cab3b3368..757653f1fc2 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f97e458be6b..f2fb7fda4d3 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 165a8550331..7a228ec1572 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 6efa388ef81..120e27ae77d 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index c8824b2d04e..a5e3fd8721b 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 311183c87f4..418e37a85b1 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 2d00f620e02..1cc5dbfaf0e 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 02052920c8a..84c72e0839b 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 0f608cbc171..8cf0ec900f8 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 75b40946559..2eed307bc54 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql index d9d0f2d1b0c..5ef6fb221e6 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_regions.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ +-- $Id: llx_c_regions.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_c_regions diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index 76caf44356d..c977dd9dd21 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 861671e3607..8307ca88eb6 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 46504e8a1c4..9a7bda88c28 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index dc284fc8cea..725ddbfeb90 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index 4f8736a3a14..a1feeb33f8b 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -13,8 +13,7 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -24,7 +23,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 85ea592d950..1e141b7768a 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 9fad6cc333e..79d54faf623 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index d6bd27758b4..97638937c74 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 40759cdc50b..211af70a854 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 80e73c43399..7c4c534451d 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index 4c466e0c02b..f2330322a5f 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 46a39b3c9e7..8e4492c28a9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 60641bf1876..39be52cf374 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index cfe126b5adf..e93ce9b4354 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index 7e12e06beb7..baa01289b96 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index 83eb804c875..bd19d25f1a5 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index 6236e113766..eb95b9fe66c 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index cf5121c34f9..2c95fde3255 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index cabdcce3a80..d62011351c4 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index ebaf9582414..a07ff049d61 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index fa9a85aac1f..730bc11ac98 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index ec8931763bf..6f129f2feec 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 9c6e2a065f8..731cf8fb0f4 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_commande.sql,v 1.13 2011/07/28 22:22:31 eldy Exp $ +-- $Id: llx_commande.sql,v 1.14 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_commande diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 7958b56f354..172a2432ee1 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ --- Supprimme orphelins pour permettre monte de la cl +-- Supprimme orphelins pour permettre mont�e de la cl� -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index 3ef51d6ae21..f1c8c7ac579 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_commande_fournisseur.sql,v 1.7 2011/07/28 22:22:31 eldy Exp $ +-- $Id: llx_commande_fournisseur.sql,v 1.8 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index 3f848c9ffe2..c13c0aa6019 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index df6d49827f6..f0c65456e5c 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index 9bb45f9d326..be4e60a9a97 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 91914ab66c7..23cfd068495 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b39863cab..d1b18165255 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index e964fbc2f5e..19ec675f973 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a747c714fb3..a53a24d9a66 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 16ecb365d6c..46639ca7c1e 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index bfce896eb19..d1ba0645e05 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index 51234007ee1..b7fc52403af 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index eead2907fa2..4187f526393 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 1c757fa6c86..7b74d8b506d 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ --- Supprimme orhpelins pour permettre monte de la cl +-- Supprimme orhpelins pour permettre mont�e de la cl� -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index 79b52ba399c..f1f4a75b604 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 3757e4522bf..39b89773316 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index f5987250001..98b29b1f715 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 9c4a5e340ab..0eb566317d0 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 906d0a3e2f4..3fb9f7d6d2d 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index 20bb329ff0e..ba595100b5f 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index 2063a310fb8..b71d2697b85 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index a99b42859c7..61d63046fac 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index f0e0a065089..0e20201f4cb 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 06af8a78575..154f0b51006 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1c5d5c30173..1dc4941012a 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index e43f4cb118c..a208aa5fff0 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index e4eb41f3bb4..f60029ee290 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 463675b10b7..2833920b746 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index fc998bd6edb..7987ca819c1 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index 1e9b0495d34..e027d471e23 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ +-- $Id: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index b899c4303e1..8b279dc578b 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 5d6d86617e6..684c5aa5a7c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index 6de1b23eb64..cdccf3eb6ec 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index 04491e0878c..fee45753759 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 575930a728c..9401f679071 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 46b769b8afc..757e8d2b447 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index e1b82141ea1..d0118ebdc6c 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 19824c860de..57d92bc8ce9 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 455916a3010..6f2ddcf56b9 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 94e726796c5..6cf13137710 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index 8dbbb572f29..cee3ace0ec3 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 923c2441987..34d0bbac03b 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index 88cf83a3cc3..ef97e48a251 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index 68e21d26061..b674a0cf11d 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index f289b9cb514..5e3620cba87 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index a2e54d34770..bd3c0c7d780 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index dbeec277f88..1524eb7a77b 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index e3e5900fb74..75a4ce8fd06 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index 0669065b7d3..eafe6bd31e1 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index dcca0174817..6a06c0c70b5 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index 99cf1edd744..d4aa4b26d99 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index 415b44c6a35..b55d734674f 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index ba8b40b3c0a..22a5b9d5c52 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 40e131fefdf..5edbea4808d 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index bc11ca42c8f..5313952606a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index 8d4a4ecdcbf..c210f906b9b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index f43ab1e746a..29598bb4963 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index a52d3ed4a8b..cfaad1061df 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 4e9f0d1da0e..521d666742d 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index c9891219f4f..29af17f7c08 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 6b8f7176dee..917d6fc5cdf 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 399dd175311..87245438b4d 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index c06074d4709..373267c8921 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index 1e3f21d0eb7..b67427b9de8 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 08450aa204f..8f00ee95200 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index 9b0104ccfe5..edc76a392b0 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 0782e089170..302248ae299 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 68b6cd9a315..9c741080a27 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 177be65fb88..4dd0ae15ad4 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index d573c90eb18..ffc0666074d 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index e0b2c2494ad..96f122e59cd 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 92000240642..4beccac04b8 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 6240a2ed5c0..484cebf6a2a 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index e2c4be38a5f..a56201f7dba 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 51e133a86dc..84f6077e5ba 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index aab9c69c1a7..46685416239 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index dc9732c0719..1d41d1ab59e 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index 663adaffe60..d6dd854a240 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 73dc6489461..0b7d6a61f56 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index 0b42446740b..c1ee00edd07 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index 7d728850185..d694d696801 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index d062249c3b8..925ca9eee81 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f33c92ea7fe..f67337de388 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 92f21a35f28..8c8454fbc28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index e62275df23d..6c673570cfc 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 29ad3853f90..9c05ed97a8d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Ocbo +-- Copyright (C) 2005 Marc Barilley / Oc�bo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b9ba378d81f..b127b194fa5 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 8771b0ddda8..5c8ea94ed09 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 8bb011f7280..94ba92d4856 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 1aba5d286d1..4017ae32682 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index e0c4fd61701..2c77ae3447c 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 1e721e86788..52c0a3e2a03 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index d4ea3ad5535..439b2a68098 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index 6f8d6a8cf97..f01b7d02e8e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index 854ec6e826e..bd1e805aed2 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index f1e90520593..bfc2162ceca 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 15d3bda5ba2..784e3d37507 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 66a61851cae..029bc528b6e 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 195d2464738..9c066c54436 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index 44a301a2db7..f4e38524d25 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index 237b5c23030..f03d92ce651 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 3bec7551161..2c9c2d929db 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index 45845593162..d9e9ecd43a7 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 672374961d5..01cabfec865 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index d8d9443595d..696cf49c337 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index f21fed4d1af..170bd56f390 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index a501b4db4b6..5a3d71b489a 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index 41a91a9aa5f..d29449c2503 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index e12dbc6fb12..86f114d395b 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index 1a83bee6508..ce320558709 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 93a28593f8e..76f76ff08ed 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index ec2bb01863b..133687c7466 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 552a985abd4..6ccd3aa39fb 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index 63b28ac8410..e24a8918c5b 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index e7ccde53858..26e451271cb 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index a1619df5cb5..40b07d29305 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index 309c60b660f..e21669e63d7 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index c92472f7af5..d094512d975 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index 3fb70995900..a75fb9aa76d 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ +-- $Id: llx_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index e7fc66a0ed6..a0d88737e3f 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 57b252ed2ea..9e28a37d6bb 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index b8453ea821c..376447586c9 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index 00268974476..e7528a03f28 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 16bf4dea7f0..4f994cf57aa 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index eff6387abee..1a7fdfd755f 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index f53599483a4..a618e3d8790 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index b9643f019c3..902f2b4fd5f 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index db4cdd2581c..1f5500e2eb1 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index 6bf45f749f5..c7d84e27326 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 7db41de673c..523eb3b37e0 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index 8dc4636c87e..bf057b4ad75 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index d500fc1b7cb..ade6a40a80d 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index a515ba541bf..bca670bbb98 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index b742b82dafc..7481589df00 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index fff909a0ec8..4adaa1a56ff 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index fb65e9b7e84..16631c76b76 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 332b1305d38..3df14473a7e 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index ca4206eb6fc..c3958313ea3 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 68e1d4f20e9..910d2ab2072 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 8714e7e4a07..5c7f2e9a59c 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index 7d3b0eecd98..cbaadb10091 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index 8bdd7193d1a..e88665b5a34 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 367d45e8525..86916c216a2 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 28b28aeb762..23065b261c8 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ +-- $Id: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index d78db14c30b..3f58eaf698b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 68e46fd120d..18924ff6ac5 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 6acb2db4585..8056a150fc3 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 838f502bfdb..1b5ea5516d4 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index f21099e9c5e..e61985c7dd1 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index f771be5ef5a..7bf81b7fbe9 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 0033bca36bc..1fb0d708dfa 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 8037c9cd7e5..6df43634ec4 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 99234b6660f..7b6cbd91645 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index dca8e80f856..810781ed6d9 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index f3a58aa1433..2e89f083575 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index 98c56c37567..fd656c736ef 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 100d9fe82b0..87f6416c6c5 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ -- ============================================================================ CREATE LANGUAGE plpgsql; 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 deleted file mode 100644 index 38e0f007a15..00000000000 --- a/htdocs/langs/es_ES/html/gpl.html +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - -H. Licencia Pública GNU - - - - - - - - - - - - - -

                    Licencia Pública GNU

                    - - - - -
                    - -GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 - -
                    - -

                    Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, - MA 02139, USA.

                    -

                    Está permitido, a cualquier persona, copiar y distribuir copias tal cual de - este documento de licencia, sin la introducción de cualquier cambio. -

                    - -
                    -

                    Introducción

                    -

                    Las licencias de muchos softwares se desarrollan para asegurar la libertad - de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, - al contrario, pretende garantizar la libertad de compartir y alterar softwares - de libre distribución - volviéndolos de libre distribución también para cualquier - de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares - de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla - (algunos softwares de la FSF son cubiertos por la GNU Library General Public - License).

                    -

                    Cuando nos referimos a softwares de libre distribución, nos referimos a la - libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar - la libertad de distribución de copias de softwares de libre distribución (y - cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos - fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se - hacen algunas restricciones, para asegurar los derechos de los programadores, - prohibiendo a todas las personas su negación o la solicitación de su abdicación. - Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución - o modificación del software.

                    -

                    Por ejemplo, al distribuirse copias de determinado programa, por una tasa - determinada o gratuitamente, se debe informar sobre todos los derechos incidentes - sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia - Pública General GNU.

                    -

                    La protección de los derechos envuelve dos pasos: (1) copyright del software - y (2) licencia que da permiso legal para copia, distribución y/o modificación - del softwares.

                    -

                    Aún para la protección de la FSF y del autor es importante que todos entiendan - que no hay garantías para softwares de libre distribución. Si software se modifica - por alguien y lo pasa adelante, este software no más reflejará el trabajo original - del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                    -

                    Finalmente, cualquier programa de libre distribución está constantemente amenazado - por las patentes de softwares. Buscamos evitar el peligro de que distribuidores - de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. - Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación - de patente se debe hacer permitiendo el uso por cualquier individuo, sin la - necesidad de licencia de uso.

                    -

                    Los términos y condiciones precisas para copia, distribución y modificación - siguen abajo:

                    -
                    -

                    Licencia Pública General GNU

                    -

                    TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN -

                    - -
                      - -

                    1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga - un aviso colocado por el detentor de los derechos de autor diciendo que aquel - podrá ser distribuido en las condiciones de la Licencia Pública General. El - Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado - en un Programa y significa tanto el propio Programa, como cualquier de los - trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, - un trabajo que contenga el Programa o una parte de este, en su forma original - o con modificaciones o traducido para una otra lengua (la traducción está - incluida sin limitaciones en el término ``modificación'').

                      -

                      Actividades distintas de copia, distribución y modificación no están cubiertas - por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa - no está restringido y la salida del Programa está cubierta solamente en - el caso de que su contenido contenga trabajos basados en el Programa (independientemente - de que hayan sido creados por la ejecución del Programa). Si esto es así, - depende de las funciones ejecutadas por el Programa.

                      2. - -

                    2. El código fuente del Programa, de la forma como fue recibido, puede ser - copiado y distribuido, en cualquier media, desde que sea providenciado un - aviso adecuado sobre los copyrights y la negación de garantías, y todos los - avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, - estén inalterados y que cualquier producto oriundo del Programa esté acompañado - de esta Licencia Pública General.

                      -

                      Está permitido el cobro de tasas por el acto físico de transferencia o - grabación de copias, y pueden ser dadas garantías y soporte en cambio del - cobro de valores.

                      3. - - -
                    3. -

                      Se puede modificar la copia o copias del Programa de cualquier forma que - se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir - tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                      - -
                        -

                      1. Debe existir un aviso destacado de que los datos originales fueron alterados - en los archivos y las fechas de los cambios;

                        2. - -

                      2. Debe existir un aviso de que el trabajo distribuido o publicado es, - de forma total o parcial, derivado del Programa o de alguna parte suya, - y que puede ser licenciado totalmente sin costes para terceros bajo los - términos de esta Licencia.

                        3. - -

                      3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, - en el inicio de tu ejecución, presentar la información de copyright y - de ausencia de garantías (o de que la garantía es de responsabilidad de - terceros), y que los usuarios pueden redistribuir el programa bajo estas - condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                        4. -
                      - - Estos requisitos se aplican a trabajos de modificación en general. Si - algunas secciones identificables no sean derivadas del Programa, y pueden - ser consideradas como partes independientes, entonces esta Licencia y sus - Términos no se aplican a aquellas secciones cuando distribuidas separadamente. - Pero al distribuir aquellas secciones como parte de un trabajo basado en - el Programa, la distribución, como un todo, debe contener los términos de - esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no - a cada una de las partes independientemente de quem los tenga desarrollado. - Más que tener intención de contestar los derechos sobre el trabajo desarrollado - por alguien, esta sección objetiva propiciar la correcta distribución de - trabajos derivados del Programa. - Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado - en él ni a un trabajo basado en él, a un volumen de almacenaje o media de - distribución no obliga la utilización de esta Licencia y de sus términos - al trabajo. -
                      4. - - -
                    4. -

                      Están permitidas, la copia y la distribución, del Programa (o un trabajo - basado en éste) en la forma de código objeto o ejecutable de acuerdo con los - términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                      - -
                        -

                      1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos - en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada - para manejo de softwares o

                        -
                        2. -

                      2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, - de poner a disposición a terceros, por un coste no superior al coste del - medio físico de almacenaje, una copia completa de los códigos fuente en - medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                        -
                        3. -

                      3. Esté acompañada con la misma información recibida en relación con la - oferta de la distribución del código fuente correspondiente (esta alternativa - solamente está permitida para distribuciones no comerciales y solamente - si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, - de acuerdo con la sección 2 arriba).

                        -
                        4. -
                      - El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones - en aquel trabajo. Cuando se habla en códigos fuentes completos significa - hablar de todos los fuentes de todos los módulos, además de las definiciones - de interfaces asociadas, archivos, scripts utilizados en la compilación - y instalación del ejecutable. Como una excepción excepcional, el código - fuente distribuido podrá no incluir algunos componentes que no se encuentren - en su escopo, como compilador, kernel, etc... para el SO donde el trabajo - sea ejecutado. - Si la distribución del ejecutable o objeto se hace, a través de acceso - a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente - de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos - con los objetos simultáneamente -
                      5. - -
                    5. -

                      No está permitida la copia, modificación, sublicenciamiento o distribución - del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier - tentativa de copia, modificación, sublicenciamiento o distribución del Programa - está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. - Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, - no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas - de esta Licencia.

                      6. -
                    6. -

                      No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá - documento o contrato que garantice permiso de modificación o distribución - del Programa o sus trabajos derivados. Estas acciones están prohibidas por - ley, en el caso de que no se acepten las condiciones de esta Licencia. La - modificación o distribución del Programa, o cualquier trabajo basado en éste, - implica en la aceptación de esta Licencia y de todos los términos de ésta - para copia, distribución o modificación del Programa o trabajos basados en - éste.

                      7. -
                    7. -

                      Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), - el recipiente automáticamente recibe una licencia del detentor original de - los derechos de copia, distribución o modificación del Programa objeto de - estos términos y condiciones. No pueden ser impuestas otras restricciones - en los recipientes.

                      8. - -
                    8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes - o derechos de autor, se impongan restricciones, que contradigan esta Licencia, - estos no exentan de su aplicación. Si no es posible distribuir el Programa - de forma a garantizar simultáneamente las obligaciones de esta Licencia y - otras que sean necesarias, entonces el Programa no podrá ser distribuido. -

                      Si esta Sección se considera, inválida por cualquier motivo particular - o general, su resultado implicará en la invalidación general de esta licencia - en la copia, modificación, sublicenciamiento o distribución del Programa - o trabajos basados en éste.

                      -

                      El propósito de esta sección no es, de forma alguna, incitar a quien quiera - que sea a infringir derechos reclamados en cuestiones válidas y procedentes, - y si proteger las premisas del sistema de libre distribución de software. - Muchas personas tienen hecho contribuciones generosas al sistema, en la - forma de programas, y es necesario garantizar la consistencia y credibilidad - del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución - de los softwares.

                      -

                      Esta sección pretende hacer claro los motivos que crearan las demás cláusulas - de estas Licencia.

                      9. - -
                    9. -

                      Si la distribución del Programa, dentro de los términos de esta Licencia, - tiene restricciones en algún País, por patentes o derechos de autor, el detentor - original de los derechos de autor del Programa bajo esta Licencia puede adicionar - explícitamente limitaciones geográficas de distribución, excluyendo aquellos - Países, haciendo con que la distribución solamente sea posible en los Países - no excluidos.

                      10. - -
                    10. -

                      La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) - puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública - General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos - objetivos y el espirito de la presente versión, pudiendo variar en detalles - referentes a nuevas situaciones encontradas.

                      -

                      A cada versión se da un número distinto. Si el Programa especifica, un - número de versión determinado de esta Licencia, que tenga en su contenido - la expresión ``o versión más actualizada'', es posible optar por las condiciones - de aquella versión o de cualquier versión más actualizada publicada por - la FSF.

                      11. - -
                    11. -

                      Si deseas incorporar parte del Programa en otros programas de libre distribución - de softwares hace falta autorización formal del autor. Para softwares que - la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde - que mantenido el espirito y objetivos originales de esta Licencia.

                      12. -
                    - -

                    AUSENCIA DE GARANTÍAS

                    -
                      -

                    1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER - GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE - EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS - DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, - LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD - Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS - CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y - REPAROS JUZGADOS NECESARIOS.

                      2. -

                    2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR - LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN - RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE - HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS - O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES - O DAÑOS.

                      -

                      FIN DE LA LICENCIA

                    - - -
                    -

                     

                    -

                    Apéndice

                    -

                    ¿Cómo aplicar estos términos a nuevos softwares?

                    -

                    Si has desarrollado un nuevo programa y deseas su amplia distribución para - el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, - que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                    -

                    Para esto basta con anexar este aviso al programa. Se recomienda indicar aún - en el inicio de cada archivo fuente la ausencia de garantías y una anotación - de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                    -

                    <nombre del programa y función> Copyright (C) 199X <Autor> -

                    -

                    Este programa es un software de libre distribución, que puede ser copiado - y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo - con la publicada por la Free Software Foundation, versión 2 de la licencia o - (a criterio del autor) cualquier versión posterior.

                    -

                    Este programa se distribuye en la expectativa de ser útil a sus usuarios, - pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE - ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General - 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. -

                    -

                    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:

                    -

                    Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares - NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software - de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. - Teclea 'muestra condic' para mayores detalles.

                    -

                    Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las - partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos - pueden variar o pueden ser accionados por otras interfaces como clic de ratón, - etc...

                    -

                     

                    -
                    -
                    - -www.conectiva.com - -
                    - - - - - diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt deleted file mode 100644 index 3efbe1ccee7..00000000000 --- a/htdocs/langs/nl_BE/html/gpl.txt +++ /dev/null @@ -1,340 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -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 deleted file mode 100644 index 778e2b02b41..00000000000 --- a/htdocs/langs/nl_NL/html/gpl.txt +++ /dev/null @@ -1,339 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van -deze licentie. \ No newline at end of file diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index c2d47f668da..4092c55ff2d 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ /** * \file htdocs/lib/admin.lib.php * \brief Library of admin functions - * \version $Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis 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.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $ */ function security_prepare_head() { @@ -615,16 +615,41 @@ function Activate($value,$withdeps=1) // Activate module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } $objMod = new $modName($db); @@ -700,20 +725,46 @@ function UnActivate($value,$requiredby=1) $modName = $value; $ret=''; + $modulesdir=array(); // Desactivation du module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } if ($found) diff --git a/htdocs/lib/ajax.lib.php b/htdocs/lib/ajax.lib.php index 7db1908bc49..55def736688 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ */ diff --git a/htdocs/lib/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/main.inc.php b/htdocs/main.inc.php index 1bdeb9562e6..49b67f9349a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 1d5b4951490..03ef2767e40 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -21,7 +21,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -29,7 +30,7 @@ * \ingroup core * \brief File that defines environment for all Dolibarr process (pages or scripts) * This script reads the conf file, init $lang, $db and and empty $user - * \version $Id: master.inc.php,v 1.351 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: master.inc.php,v 1.350 2011/07/30 10:23:24 eldy Exp $ */ diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index 454073d9730..d6bf7267439 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index b5304ba4198..6e1e7b262f4 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index bda35165079..b0a7c2dece6 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id$ + * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ */ if (session_id() == "") session_start(); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 8bccf934120..1da2adb751e 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ + * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index efbd289cb3f..a65f888ab11 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ + * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ */ require("../main.inc.php"); @@ -1645,6 +1646,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 8f373b577e8..79601ea1031 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 724900dc500..8cf57ec0b64 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ + * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ */ require("../main.inc.php"); @@ -271,5 +272,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); +llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); ?> diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 1dfd99cc99e..ec5d660daef 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -25,7 +25,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.125 2011/07/31 23:22:57 eldy Exp $ + * \version $Id: soc.php,v 1.126 2011/08/01 00:38:49 eldy Exp $ */ require("../main.inc.php"); @@ -587,7 +587,8 @@ else if ($conf->fournisseur->enabled && (GETPOST("type")=='f' || GETPOST("type")=='')) { $object->fournisseur=1; } if (GETPOST("private")==1) { $object->particulier=1; } - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prenom=$_POST["prenom"]; $object->particulier=$_REQUEST["private"]; $object->prefix_comm=$_POST["prefix_comm"]; @@ -1093,7 +1094,8 @@ else if (! empty($_POST["nom"])) { // We overwrite with values if posted - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prefix_comm=$_POST["prefix_comm"]; $object->client=$_POST["client"]; $object->code_client=$_POST["code_client"]; @@ -1967,5 +1969,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.125 $'); +llxFooter('$Date: 2011/08/01 00:38:49 $ - $Revision: 1.126 $'); ?> \ No newline at end of file diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index f93935ffb16..e78dff8f646 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id$ + * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index e4e52c611b4..9edcafd59c0 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/group/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.39 2011/07/31 23:21:25 eldy Exp $ + * \version $Id: perms.php,v 1.40 2011/08/01 13:15:53 hregis Exp $ */ require("../../main.inc.php"); @@ -93,10 +93,34 @@ if ($_GET["id"]) // Charge les modules soumis a permissions $modules = array(); - foreach ($conf->file->dol_document_root as $dirroot) + $modulesdir = array(); + + foreach ($conf->file->dol_document_root as $type => $dirroot) + { + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } + + foreach ($modulesdir as $dir) { - $dir = $dirroot . "/includes/modules/"; - // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                    "; $handle=@opendir($dir); @@ -292,5 +316,5 @@ if ($_GET["id"]) $db->close(); -llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.39 $'); +llxFooter('$Date: 2011/08/01 13:15:53 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index adb7fa764b6..47710b31d9d 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.56 2011/07/31 23:19:42 eldy Exp $ + * \version $Id: perms.php,v 1.57 2011/08/01 13:15:54 hregis Exp $ */ require("../main.inc.php"); @@ -120,12 +120,34 @@ $db->begin(); // Search all modules with permission and reload permissions def. $modules = array(); +$modulesdir = array(); -$listdir=$conf->file->dol_document_root; -foreach($listdir as $dirroot) +foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir=$dirroot."/includes/modules/"; + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} +foreach($modulesdir as $dir) +{ $handle=opendir($dir); if (is_resource($handle)) { @@ -373,5 +395,5 @@ print '
                    '; $db->close(); -llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.56 $'); +llxFooter('$Date: 2011/08/01 13:15:54 $ - $Revision: 1.57 $'); ?> From 2ab80fb45bcfb09cacc6284d2c131afb24a86035 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 00:47:15 +0000 Subject: [PATCH 054/118] Work on debian package --- build/makepack-dolibarr.pl | 137 +++++++++++++++--------------- build/rpm/README | 23 +++-- build/rpm/dolibarr.spec | 166 ++++++++++++++++++++----------------- 3 files changed, 178 insertions(+), 148 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 20c5ba415e9..f1527da165b 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.129 2011/08/01 18:22:26 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.130 2011/08/03 00:47:37 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -306,21 +306,23 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; - #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; - #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; } # Build package for each target @@ -443,57 +445,61 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$FILENAMETGZ2"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; + print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n"; + $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\""; $ret=`$cmd`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; # Apache conf files - #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; - #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + $ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`; # Dolibarr conf files # TODO @@ -518,21 +524,21 @@ if ($nboftargetok) { $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; # Build tgz @@ -569,7 +575,7 @@ if ($nboftargetok) { next; } - + if ($target eq 'DEB') { $olddir=getcwd(); @@ -608,7 +614,7 @@ if ($nboftargetok) { $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; - open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; + open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -662,6 +668,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`; diff --git a/build/rpm/README b/build/rpm/README index c157a195c03..f20bf91db72 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -5,15 +5,24 @@ RPM Package tools This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, -with format RPM (for Redhat, Mandriva, ...). +with format RPM (for Redhat, OpenSuse, Mandriva, ...). -# This is standard command to work on Debian packaging: +# This is standard command to work on RPM packaging: +# +# yum -y install rpmlint +# yum -y install hunspell-en hunspell-es hunspell-fr hunspell-it +# +# rpmlint file.rpm Test a package +# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm # # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies -# yum erase dolibarr To remove package +# yum erase dolibarr To remove package +# chcon -R -h -t httpd_sys_script_rw_t /file To add temporary context rw for httpd on /file +# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" To add persistent context rw for httpd on /dir (this add file_contexts.local) +# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage) # # On OpenSuse # yast --install dolibarr-...rpm To install package and dependencies @@ -40,7 +49,9 @@ different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. I am author of other already packaged OpenSources packages (awstats) but this is my first package to maintain myself. So i'm seeking a sponsor. - - Edit field "Block" and add FE-NEEDSPONSOR - -- Check bug is into database by searching with id on https://bugzilla.redhat.com/ \ No newline at end of file +- Check bug is into database by searching with id on https://bugzilla.redhat.com/ +- Install fedora packager tools: yum install fedora-packager +- Setup fedora packagers tools: fedora-packager-setup +- Send your package: koji build --scratch f16 path_to_source_RPM +- Check if package is available: http://koji.fedoraproject.org/koji/ \ No newline at end of file diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 1754220c6c7..08fe933d774 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -5,6 +5,11 @@ # file to build a package for your own distributions and # edit it if you need to match your rules. # -------------------------------------------------------- + +#%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0) +#%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) +#%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0) + %define name dolibarr %define version __VERSION__ %define release __RELEASE__ @@ -12,9 +17,12 @@ Name: %{name} Version: %{version} Release: %{release} -Summary: Dolibarr +Summary: ERP and CRM software for small and medium companies or foundations +Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos +Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations +Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti -License: GPL +License: GPLv2+ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team @@ -48,7 +56,7 @@ AutoReqProv: no %description -Dolibarr ERP & CRM is an easy to use open source/free software for small +An easy to use CRM & ERP open source/free software for small and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. @@ -56,27 +64,26 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Dolibarr ERP y CRM es un software open source/gratis para pequeñas y -medianas empresas, asociaciones o autónomos. Incluye diferentes -funcionalidades para la Planificación de Recursos Empresariales (ERP) y -Gestión de la Relación con los Clientes (CRM) así como para para otras -diferentes actividades. Dolibarr ha sido diseñado para suministrarle -solamente las funcionalidades que necesita y haciendo hincapié en su -facilidad de uso. +Un software ERP y CRM para pequeñas y medianas empresas, asociaciones +o autónomos. Incluye diferentes funcionalidades para la Planificación +de Recursos Empresariales (ERP) y Gestión de la Relación con los +Clientes (CRM) así como para para otras diferentes actividades. +Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades +que necesita y haciendo hincapié en su facilidad de uso. %description -l fr -Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, +Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, artisans ou associations. Il permet de gérer vos clients, prospect, fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Dolibarr è un programma gestionale open source e gratuito per piccole e medie +Un programmo gestionale per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori -attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno +attività. Progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. -Dolibar è completamente web-based, progettato per poter fornire solo ciò di +Programmo web, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. @@ -94,48 +101,51 @@ echo Building %{name}-%{version}-%{release} #---- install %install -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr +%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf +%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr -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 +# %{_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 -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README -install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/doc $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/htdocs $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT #---- clean %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT #---- files %files + %defattr(-,root,root) -%doc README -%doc COPYRIGHT %doc /var/www/dolibarr/doc/* %dir /var/www/dolibarr/build %dir /var/www/dolibarr/htdocs %dir /var/www/dolibarr/scripts -%_datadir/pixmaps/* +%_datadir/pixmaps/dolibarr.png %_datadir/applications/%{name}.desktop /var/www/dolibarr/build/* /var/www/dolibarr/htdocs/* /var/www/dolibarr/scripts/* -/var/www/dolibarr/README -/var/www/dolibarr/COPYRIGHT -#%config /var/www/dolibarr/htdocs/conf/conf.php + +%defattr(0664, -, -, 0755) +%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf +%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr #---- post (after unzip during install) @@ -153,9 +163,11 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="/usr/share/dolibarr/install.lock" +export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" +export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="/usr/share/dolibarr/install.lock" # Detect OS @@ -189,8 +201,8 @@ echo OS detected: $os # Create empty directory for uploaded files and generated documents echo Create document directory $docdir -mkdir -p $docdir -mkdir -p %{_sysconfdir}/dolibarr +%{__mkdir} -p $docdir +%{__mkdir} -p %{_sysconfdir}/dolibarr # Create install.forced.php into Dolibarr install directory superuserlogin='' @@ -202,12 +214,12 @@ if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then fi echo Mysql superuser found to use is $superuserlogin if [ -z "$superuserlogin" ] ; then - cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig + %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig else - cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig + %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig fi -chown -R root:$apachegroup $installconfig -chmod -R 660 $installconfig +%{__chown} -R root:$apachegroup $installconfig +%{__chmod} -R 660 $installconfig # Create an empty conf.php with permission to web server if [ ! -f $config ] @@ -218,15 +230,24 @@ then chmod -R 660 $config fi -# Create a config file $apacheconfig -if [ ! -f $apacheconfig ]; then - echo Create dolibarr web server config file $apacheconfig - cp $apachefileorig $apacheconfig - chmod a-x $apacheconfig - chmod go-w $apacheconfig +# Create config file for apache $apacheconfig +#if [ ! -f $apacheconfig ]; then +# echo Create dolibarr web server config file $apacheconfig +# cp $apachefileorig $apacheconfig +# chmod a-x $apacheconfig +# chmod go-w $apacheconfig +#fi + +# Create config file for se $seconfig +if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then + echo Add SE Linux permission from file $sefileorig +# cp $sefileorig $seconfig + restorecon -R -v /etc/dolibarr + restorecon -R -v /var/www/dolibarr + restorecon -R -v /usr/share/dolibarr fi -# Create a config link dolibarr.conf for Fedora or Redhat +# Create a config link dolibarr.conf if [ ! -f $apachelink ]; then echo Create dolibarr web server config link $apachelink ln -fs $apacheconfig $apachelink @@ -242,18 +263,6 @@ echo Set permission to $apacheuser:$apachegroup on $docdir chown -R $apacheuser:$apachegroup $docdir chmod -R o-w $docdir -# Set SE Linux on OS SE is enabled -if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then - echo Set SELinux permissions - # Warning: chcon seems not cumulative - #chcon -R -h -t httpd_sys_content_t $targetdir - #chcon -R -h -t httpd_sys_content_t $docdir - chcon -R -h -t httpd_sys_script_rw_t $targetdir - chcon -R -h -t httpd_sys_script_rw_t $docdir - chcon -R -h -t httpd_sys_script_rw_t %{_sysconfdir}/dolibarr - #chcon -R -h -t httpd_sys_script_exec_t $targetdir -fi - # Restart web server echo Restart web server if [ -f %{_sysconfdir}/init.d/httpd ]; then @@ -263,6 +272,12 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then %{_sysconfdir}/init.d/apache2 restart fi +# Restart mysql +echo Restart mysql +if [ -f /etc/init.d/mysqld ]; then + /etc/init.d/mysqld restart +fi + # Show result echo echo "----- Dolibarr %version - (c) Dolibarr dev team -----" @@ -290,9 +305,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="$targetdir/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="$targetdir/install.lock" # Detect OS @@ -327,7 +342,7 @@ echo OS detected: $os if [ -f $apachelink ] ; then echo Delete apache config link for Dolibarr - rm -f $apachelink + %{__rm} -f $apachelink status=purge fi @@ -345,19 +360,16 @@ 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 -- Initial upstream (#723326) +* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 +- Initial version (#723326) From f987ee543e91cecb0584fe095ceefc1282a522c1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:03:45 +0000 Subject: [PATCH 055/118] Fix: Avoid errors into rpm packages From cd29e7996174dca81f6d4d0ab507c1b636d6b76c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:13:30 +0000 Subject: [PATCH 056/118] Fix: Avoid errors into rpm packages --- htdocs/boutique/index.php | 10 +- htdocs/langs/es_ES/html/gpl.html | 330 ++++++++++++++++++++++++++++++ htdocs/langs/nl_BE/html/gpl.txt | 340 +++++++++++++++++++++++++++++++ htdocs/langs/nl_NL/html/gpl.txt | 339 ++++++++++++++++++++++++++++++ 4 files changed, 1014 insertions(+), 5 deletions(-) create mode 100644 htdocs/langs/es_ES/html/gpl.html create mode 100644 htdocs/langs/nl_BE/html/gpl.txt create mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php index 17a59229716..a0d12d3457c 100644 --- a/htdocs/boutique/index.php +++ b/htdocs/boutique/index.php @@ -17,10 +17,10 @@ */ /** - \file htdocs/boutique/index.php - \ingroup boutique - \brief Page accueil zone boutique - \version $Id: index.php,v 1.16 2011/08/03 00:45:46 eldy Exp $ + * \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 $ */ require("../main.inc.php"); @@ -238,5 +238,5 @@ print ''; $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.16 $'); +llxFooter('$Date: 2011/08/03 01:17:17 $ - $Revision: 1.17 $'); ?> diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html new file mode 100644 index 00000000000..38e0f007a15 --- /dev/null +++ b/htdocs/langs/es_ES/html/gpl.html @@ -0,0 +1,330 @@ + + + + + + + + +H. Licencia Pública GNU + + + + + + + + + + + + + +

                    Licencia Pública GNU

                    + + + + +
                    + +GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 + +
                    + +

                    Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, + MA 02139, USA.

                    +

                    Está permitido, a cualquier persona, copiar y distribuir copias tal cual de + este documento de licencia, sin la introducción de cualquier cambio. +

                    + +
                    +

                    Introducción

                    +

                    Las licencias de muchos softwares se desarrollan para asegurar la libertad + de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, + al contrario, pretende garantizar la libertad de compartir y alterar softwares + de libre distribución - volviéndolos de libre distribución también para cualquier + de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares + de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla + (algunos softwares de la FSF son cubiertos por la GNU Library General Public + License).

                    +

                    Cuando nos referimos a softwares de libre distribución, nos referimos a la + libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar + la libertad de distribución de copias de softwares de libre distribución (y + cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos + fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se + hacen algunas restricciones, para asegurar los derechos de los programadores, + prohibiendo a todas las personas su negación o la solicitación de su abdicación. + Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución + o modificación del software.

                    +

                    Por ejemplo, al distribuirse copias de determinado programa, por una tasa + determinada o gratuitamente, se debe informar sobre todos los derechos incidentes + sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia + Pública General GNU.

                    +

                    La protección de los derechos envuelve dos pasos: (1) copyright del software + y (2) licencia que da permiso legal para copia, distribución y/o modificación + del softwares.

                    +

                    Aún para la protección de la FSF y del autor es importante que todos entiendan + que no hay garantías para softwares de libre distribución. Si software se modifica + por alguien y lo pasa adelante, este software no más reflejará el trabajo original + del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                    +

                    Finalmente, cualquier programa de libre distribución está constantemente amenazado + por las patentes de softwares. Buscamos evitar el peligro de que distribuidores + de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. + Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación + de patente se debe hacer permitiendo el uso por cualquier individuo, sin la + necesidad de licencia de uso.

                    +

                    Los términos y condiciones precisas para copia, distribución y modificación + siguen abajo:

                    +
                    +

                    Licencia Pública General GNU

                    +

                    TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN +

                    + +
                      + +

                    1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga + un aviso colocado por el detentor de los derechos de autor diciendo que aquel + podrá ser distribuido en las condiciones de la Licencia Pública General. El + Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado + en un Programa y significa tanto el propio Programa, como cualquier de los + trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, + un trabajo que contenga el Programa o una parte de este, en su forma original + o con modificaciones o traducido para una otra lengua (la traducción está + incluida sin limitaciones en el término ``modificación'').

                      +

                      Actividades distintas de copia, distribución y modificación no están cubiertas + por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa + no está restringido y la salida del Programa está cubierta solamente en + el caso de que su contenido contenga trabajos basados en el Programa (independientemente + de que hayan sido creados por la ejecución del Programa). Si esto es así, + depende de las funciones ejecutadas por el Programa.

                      2. + +

                    2. El código fuente del Programa, de la forma como fue recibido, puede ser + copiado y distribuido, en cualquier media, desde que sea providenciado un + aviso adecuado sobre los copyrights y la negación de garantías, y todos los + avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, + estén inalterados y que cualquier producto oriundo del Programa esté acompañado + de esta Licencia Pública General.

                      +

                      Está permitido el cobro de tasas por el acto físico de transferencia o + grabación de copias, y pueden ser dadas garantías y soporte en cambio del + cobro de valores.

                      3. + + +
                    3. +

                      Se puede modificar la copia o copias del Programa de cualquier forma que + se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir + tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                      + +
                        +

                      1. Debe existir un aviso destacado de que los datos originales fueron alterados + en los archivos y las fechas de los cambios;

                        2. + +

                      2. Debe existir un aviso de que el trabajo distribuido o publicado es, + de forma total o parcial, derivado del Programa o de alguna parte suya, + y que puede ser licenciado totalmente sin costes para terceros bajo los + términos de esta Licencia.

                        3. + +

                      3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, + en el inicio de tu ejecución, presentar la información de copyright y + de ausencia de garantías (o de que la garantía es de responsabilidad de + terceros), y que los usuarios pueden redistribuir el programa bajo estas + condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                        4. +
                      + + Estos requisitos se aplican a trabajos de modificación en general. Si + algunas secciones identificables no sean derivadas del Programa, y pueden + ser consideradas como partes independientes, entonces esta Licencia y sus + Términos no se aplican a aquellas secciones cuando distribuidas separadamente. + Pero al distribuir aquellas secciones como parte de un trabajo basado en + el Programa, la distribución, como un todo, debe contener los términos de + esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no + a cada una de las partes independientemente de quem los tenga desarrollado. + Más que tener intención de contestar los derechos sobre el trabajo desarrollado + por alguien, esta sección objetiva propiciar la correcta distribución de + trabajos derivados del Programa. + Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado + en él ni a un trabajo basado en él, a un volumen de almacenaje o media de + distribución no obliga la utilización de esta Licencia y de sus términos + al trabajo. +
                      4. + + +
                    4. +

                      Están permitidas, la copia y la distribución, del Programa (o un trabajo + basado en éste) en la forma de código objeto o ejecutable de acuerdo con los + términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                      + +
                        +

                      1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos + en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada + para manejo de softwares o

                        +
                        2. +

                      2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, + de poner a disposición a terceros, por un coste no superior al coste del + medio físico de almacenaje, una copia completa de los códigos fuente en + medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                        +
                        3. +

                      3. Esté acompañada con la misma información recibida en relación con la + oferta de la distribución del código fuente correspondiente (esta alternativa + solamente está permitida para distribuciones no comerciales y solamente + si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, + de acuerdo con la sección 2 arriba).

                        +
                        4. +
                      + El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones + en aquel trabajo. Cuando se habla en códigos fuentes completos significa + hablar de todos los fuentes de todos los módulos, además de las definiciones + de interfaces asociadas, archivos, scripts utilizados en la compilación + y instalación del ejecutable. Como una excepción excepcional, el código + fuente distribuido podrá no incluir algunos componentes que no se encuentren + en su escopo, como compilador, kernel, etc... para el SO donde el trabajo + sea ejecutado. + Si la distribución del ejecutable o objeto se hace, a través de acceso + a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente + de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos + con los objetos simultáneamente +
                      5. + +
                    5. +

                      No está permitida la copia, modificación, sublicenciamiento o distribución + del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier + tentativa de copia, modificación, sublicenciamiento o distribución del Programa + está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. + Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, + no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas + de esta Licencia.

                      6. +
                    6. +

                      No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá + documento o contrato que garantice permiso de modificación o distribución + del Programa o sus trabajos derivados. Estas acciones están prohibidas por + ley, en el caso de que no se acepten las condiciones de esta Licencia. La + modificación o distribución del Programa, o cualquier trabajo basado en éste, + implica en la aceptación de esta Licencia y de todos los términos de ésta + para copia, distribución o modificación del Programa o trabajos basados en + éste.

                      7. +
                    7. +

                      Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), + el recipiente automáticamente recibe una licencia del detentor original de + los derechos de copia, distribución o modificación del Programa objeto de + estos términos y condiciones. No pueden ser impuestas otras restricciones + en los recipientes.

                      8. + +
                    8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes + o derechos de autor, se impongan restricciones, que contradigan esta Licencia, + estos no exentan de su aplicación. Si no es posible distribuir el Programa + de forma a garantizar simultáneamente las obligaciones de esta Licencia y + otras que sean necesarias, entonces el Programa no podrá ser distribuido. +

                      Si esta Sección se considera, inválida por cualquier motivo particular + o general, su resultado implicará en la invalidación general de esta licencia + en la copia, modificación, sublicenciamiento o distribución del Programa + o trabajos basados en éste.

                      +

                      El propósito de esta sección no es, de forma alguna, incitar a quien quiera + que sea a infringir derechos reclamados en cuestiones válidas y procedentes, + y si proteger las premisas del sistema de libre distribución de software. + Muchas personas tienen hecho contribuciones generosas al sistema, en la + forma de programas, y es necesario garantizar la consistencia y credibilidad + del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución + de los softwares.

                      +

                      Esta sección pretende hacer claro los motivos que crearan las demás cláusulas + de estas Licencia.

                      9. + +
                    9. +

                      Si la distribución del Programa, dentro de los términos de esta Licencia, + tiene restricciones en algún País, por patentes o derechos de autor, el detentor + original de los derechos de autor del Programa bajo esta Licencia puede adicionar + explícitamente limitaciones geográficas de distribución, excluyendo aquellos + Países, haciendo con que la distribución solamente sea posible en los Países + no excluidos.

                      10. + +
                    10. +

                      La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) + puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública + General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos + objetivos y el espirito de la presente versión, pudiendo variar en detalles + referentes a nuevas situaciones encontradas.

                      +

                      A cada versión se da un número distinto. Si el Programa especifica, un + número de versión determinado de esta Licencia, que tenga en su contenido + la expresión ``o versión más actualizada'', es posible optar por las condiciones + de aquella versión o de cualquier versión más actualizada publicada por + la FSF.

                      11. + +
                    11. +

                      Si deseas incorporar parte del Programa en otros programas de libre distribución + de softwares hace falta autorización formal del autor. Para softwares que + la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde + que mantenido el espirito y objetivos originales de esta Licencia.

                      12. +
                    + +

                    AUSENCIA DE GARANTÍAS

                    +
                      +

                    1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER + GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE + EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS + DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, + LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD + Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS + CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y + REPAROS JUZGADOS NECESARIOS.

                      2. +

                    2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR + LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN + RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE + HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS + O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES + O DAÑOS.

                      +

                      FIN DE LA LICENCIA

                    + + +
                    +

                     

                    +

                    Apéndice

                    +

                    ¿Cómo aplicar estos términos a nuevos softwares?

                    +

                    Si has desarrollado un nuevo programa y deseas su amplia distribución para + el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, + que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                    +

                    Para esto basta con anexar este aviso al programa. Se recomienda indicar aún + en el inicio de cada archivo fuente la ausencia de garantías y una anotación + de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                    +

                    <nombre del programa y función> Copyright (C) 199X <Autor> +

                    +

                    Este programa es un software de libre distribución, que puede ser copiado + y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo + con la publicada por la Free Software Foundation, versión 2 de la licencia o + (a criterio del autor) cualquier versión posterior.

                    +

                    Este programa se distribuye en la expectativa de ser útil a sus usuarios, + pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE + ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General + 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. +

                    +

                    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:

                    +

                    Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares + NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software + de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. + Teclea 'muestra condic' para mayores detalles.

                    +

                    Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las + partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos + pueden variar o pueden ser accionados por otras interfaces como clic de ratón, + etc...

                    +

                     

                    +
                    +
                    + +www.conectiva.com + +
                    + + + + + diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt new file mode 100644 index 00000000000..3efbe1ccee7 --- /dev/null +++ b/htdocs/langs/nl_BE/html/gpl.txt @@ -0,0 +1,340 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +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 new file mode 100644 index 00000000000..778e2b02b41 --- /dev/null +++ b/htdocs/langs/nl_NL/html/gpl.txt @@ -0,0 +1,339 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van +deze licentie. \ No newline at end of file From 6f656ffe7cf93311bf08300c82f258e427c94029 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 23:54:11 +0000 Subject: [PATCH 057/118] Fix: Avoid errors into rpm packages From b40e055d7d626c6761378ca6b2b36c7e1a7b3fb7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Aug 2011 00:38:49 +0000 Subject: [PATCH 058/118] Fix: bug #33900 : Third party name reset after the autocompletion of city name From 544d947193388d769b678fc1a36aad6e31d6e17a Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Aug 2011 12:08:31 +0000 Subject: [PATCH 059/118] Fix: case problem From 3bfa9425baca9687d0935247fd2406bba748dc30 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Aug 2011 12:25:14 +0000 Subject: [PATCH 060/118] New: possibility to use includes/modules in external modules dir --- htdocs/admin/modules.php | 11 ++++++----- htdocs/master.inc.php | 9 ++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 671bd69a0e4..a5025c44000 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -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.158 2011/08/01 12:28:09 hregis Exp $ */ require("../main.inc.php"); @@ -89,10 +89,10 @@ foreach ($conf->file->dol_document_root as $type => $dirroot) if ($type == 'alt') { - $althandle=@opendir($dirroot); - if (is_resource($althandle)) + $handle=@opendir($dirroot); + if (is_resource($handle)) { - while (($file = readdir($althandle))!==false) + while (($file = readdir($handle))!==false) { if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') { @@ -102,6 +102,7 @@ foreach ($conf->file->dol_document_root as $type => $dirroot) } } } + closedir($handle); } } } @@ -472,5 +473,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $'); +llxFooter('$Date: 2011/08/01 12:28:09 $ - $Revision: 1.158 $'); ?> diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 03ef2767e40..eedd6a8841c 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -21,8 +21,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -30,7 +29,7 @@ * \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.350 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ */ @@ -71,14 +70,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root[]=$value; + $conf->file->dol_document_root['alt']=$value; } } From 3416d75e6ef3a143befc00bff108ca916df4cbca Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Aug 2011 12:25:15 +0000 Subject: [PATCH 061/118] New: possibility to use includes/modules in external modules dir --- htdocs/admin/modules.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index a5025c44000..671bd69a0e4 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -22,7 +22,7 @@ /** * \file htdocs/admin/modules.php * \brief Page to activate/disable all modules - * \version $Id: modules.php,v 1.158 2011/08/01 12:28:09 hregis Exp $ + * \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $ */ require("../main.inc.php"); @@ -89,10 +89,10 @@ foreach ($conf->file->dol_document_root as $type => $dirroot) if ($type == 'alt') { - $handle=@opendir($dirroot); - if (is_resource($handle)) + $althandle=@opendir($dirroot); + if (is_resource($althandle)) { - while (($file = readdir($handle))!==false) + while (($file = readdir($althandle))!==false) { if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') { @@ -102,7 +102,6 @@ foreach ($conf->file->dol_document_root as $type => $dirroot) } } } - closedir($handle); } } } @@ -473,5 +472,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/01 12:28:09 $ - $Revision: 1.158 $'); +llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $'); ?> From 4efe626f0be1a7fd38e49c610e20e6fb9b3b79d1 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Aug 2011 12:53:37 +0000 Subject: [PATCH 062/118] New: possibility to use includes/modules in external modules dir From b80d38925aac7a229dfff4f4cc732a019a578cc8 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Aug 2011 13:15:53 +0000 Subject: [PATCH 063/118] New: possibility to use includes/modules in external modules dir From 8ebc0ab51a1123917cbcac1714bba22ce87b95bb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 23:24:38 +0000 Subject: [PATCH 064/118] Fix: Avoid errors into rpm packages --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/control.DEBIAN | 46 + build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 - build/deb/install | 1 - build/deb/po/fr.po | 22 +- build/deb/po/templates.pot | 20 +- build/deb/postinst | 100 +- build/deb/postrm | 119 +- build/deb/templates | 7 - build/makepack-dolibarr.pl | 163 ++- 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 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 33 +- htdocs/admin/perms.php | 32 +- htdocs/admin/proxy.php | 7 +- htdocs/admin/security_other.php | 7 +- htdocs/admin/system/constall.php | 5 +- htdocs/boxes.php | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/tpl/menu.tpl.php | 13 +- htdocs/cashdesk/tpl/validation1.tpl.php | 21 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/compta/prelevement/create.php | 7 +- htdocs/core/class/html.form.class.php | 11 +- htdocs/core/class/interfaces.class.php | 5 +- htdocs/filefunc.inc.php | 7 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 +++++++++-------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/index.php | 7 +- htdocs/install/check.php | 5 +- htdocs/install/default.css | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- .../install/mysql/data/llx_c_currencies.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/data/llx_c_tva.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_departements.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_regions.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- htdocs/install/mysql/tables/llx_commande.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../mysql/tables/llx_commande_fournisseur.sql | 5 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/lib/admin.lib.php | 77 +- htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 6 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- htdocs/societe/soc.php | 10 +- .../smartphone/theme/default/default.css.php | 5 +- htdocs/user/group/perms.php | 34 +- htdocs/user/perms.php | 32 +- 343 files changed, 1829 insertions(+), 1748 deletions(-) create mode 100755 build/deb/control.DEBIAN diff --git a/build/deb/README b/build/deb/README index d73d7a99219..edb46ffd5a3 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,13 +22,12 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build binary only package +# dpkg -b To build package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# dpkg-reconfigure -plow package Reconfigure package +# # dpkg -L packagename List content of installed package -# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index 3382966714b..b035f18ae1d 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 + -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN new file mode 100755 index 00000000000..7c66775bdf1 --- /dev/null +++ b/build/deb/control.DEBIAN @@ -0,0 +1,46 @@ +Package: dolibarr +Version: __VERSION__ +Architecture: all +Maintainer: Laurent Destailleur +Installed-Size: 61200 +Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Section: web +Priority: optional +Homepage: http://www.dolibarr.org +Description: Easy to use web based ERP & CRM software + Dolibarr ERP & CRM is an easy to use open source/free software for small + and medium companies, foundations or freelances. It includes different + features for Enterprise Resource Planning (ERP) and Customer Relationship + Management (CRM) but also for different other activities. + It's a web software you can install as a standalone program or on any web + hosting provider to use it from anywhere with any web browser. + Dolibarr was designed to provide only features you need and be easy to use. + . + Only features you need are visible, depending on which module were activated. + Most common used modules are: + . + Customers, Suppliers or Prospects directory, + Contacts directory, + Orders management, + Commercial proposals management, + Invoices management, + Products and services catalog, + Stock management, + Foundations members management, + Bank accounts management, + Point of Sale, + Payments management, + Commercial actions management, + Contracts management, + Standing orders management, + Shipping management, + Donations management, + Bookmarks management, + Mass Emailings, + Reports, + Wizards to export and import data, + LDAP connectivity, + PDF exports, + And a lot of more modules... + . + You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index e28258d8dbc..91f0705c001 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,16 +4,10 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper (>= 7), po-debconf +Build-Depends: debhelper, po-debconf Package: dolibarr -Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, - php5-mysql | php5-mysqli, - php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, - ${misc:Depends}, xdg-utils, - mysql-server, perl -Recommends: apache2 | lighttpd | httpd, mysql-client -Suggests: www-browser +Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl Architecture: all Section: web Priority: optional diff --git a/build/deb/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 b/build/deb/install index 2928d378abc..4d41fd52c65 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,5 +1,4 @@ etc/dolibarr/apache.conf -etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 3bbe762283a..13b8030ed0d 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:49+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,26 +25,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Seveur web à reconfigurer automatiquement:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"dolibarr." -msgstr "" -"Selectionnez le serveur web à configurer automatiquement pour utiliser " -"dolibarr." - # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -52,7 +36,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index d65e5d8b7f6..32c92a97cc4 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,29 +17,15 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"dolibarr." -msgstr "" - #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index e0bba1be4da..ca5fd1645dd 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,5 +1,7 @@ #!/bin/sh # postinst script for dolibarr +# +# see: dh_installdeb(1) set -e @@ -14,31 +16,6 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - - -lighttpd_install() { - if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - if which lighty-enable-mod >/dev/null 2>&1 ; then - echo "Add link for Lighttpd config file" - ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf - # We enabled it - lighty-enable-mod dolibarr fastcgi-php - else - echo "Lighttpd not installed, skipping" - fi - fi -} - -apache_install() { - webserver=$1 - if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Add link for Apache config file" - ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - . /usr/share/debconf/confmodule db_version 2.0 @@ -50,6 +27,8 @@ echo Run the dolibarr postinst script # Define vars docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" installconfig="/etc/dolibarr/install.forced.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php" @@ -65,6 +44,10 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir + # Copy apache.conf file into target directory + #mkdir -p /etc/dolibarr + #cp -p $apachefileorig $apacheconfig + # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -91,15 +74,21 @@ case "$1" in chmod -R 660 $config fi - - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - + # Get the web server type (use db_get for interactive mode). + #db_reset "dolibarr/webserver" + #db_get "dolibarr/webserver" # Read value for webserver. + #webserver="$RET" + + case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; + esac + # Set up web server. - for webserver in $webservers ; do - webserver=${webserver%,} - echo Complete config of server $webserver + for server in $webservers ; do + echo Complete config of server $server # Detect webuser and webgroup webuser= @@ -117,31 +106,26 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config + + # Add link to config file + echo Setup web server $server to add dolibarr config file + ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf + done - # Restart web server. - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_install - else - apache_install $webserver - fi - # Reload webserver in any case, configuration might have changed - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $webserver reload 3>/dev/null || true - else - echo Restart web server $server using $server reload - /etc/init.d/$webserver reload 3>/dev/null || true - fi - fi + # Restart servers + servers="apache2-ssl apache2 mysql" + # Another way to restart + for server in $servers ; do + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $server reload || true + else + echo Restart web server $server using $server reload + /etc/init.d/$server reload || true + fi done - echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -152,13 +136,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument $1" >&2 + echo "postinst called with unknown argument \`$1'" >&2 exit 0 ;; esac -#DEBHELPER# - db_stop +#DEBHELPER# + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 27ce3777b7e..9eae81b022b 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,36 +17,7 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - -lighttpd_remove() { - if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - echo "Remove link for Lighttpd config file" - rm -f /etc/lighttpd/conf-available/50-dolibarr.conf - if which lighty-enable-mod >/dev/null 2>&1 ; then - lighty-disable-mod dolibarr - else - echo "Lighttpd not installed, skipping" - fi - # See bug #448682 - if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then - echo 'Manually deleting lighttpd/dolibarr configuration link' - rm /etc/lighttpd/conf-enabled/50-dolibarr.conf - fi - fi -} - -apache_remove() { - if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Remove link for Apache config file" - rm -f /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule -fi +. /usr/share/debconf/confmodule db_version 2.0 @@ -55,62 +26,63 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" +export webserver="" +# Allows us to loop and substitute in one pass +case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; +esac + case "$1" in # Call when we upgrade upgrade) - echo "postrm upgrade" ;; # Call when we uninstall remove) - echo "postrm remove" rm -f $lockfile - # Reconfigure web server - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - - # Restart web servers - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_remove - else - apache_remove $webserver - fi - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $webserver reload 3>/dev/null || true - else - /etc/init.d/$webserver reload 3>/dev/null || true - fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete link $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge" + echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical dolibarr/postrm || true + db_input critical "dolibarr/postrm" || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get dolibarr/postrm + db_get "dolibarr/postrm" set -e if [ "$RET" = "true" ] ; then @@ -213,12 +185,41 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete file $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" + fi + done + rm -rf /etc/dolibarr + # Restart servers + for server in $restart ; do + # We disable blocking errors + set +e + echo "Restart server $server if exists" + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $server reload || true + else + /etc/init.d/$server reload || true + fi + # We restore blocking errors + set -e + done + # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset dolibarr/reconfigure-webserver - db_reset dolibarr/postrm + db_reset "dolibarr/postrm" set -e #db_purge @@ -228,7 +229,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument $1" >&2 + echo "postrm called with unknown argument \`$1'" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index b96325a4e64..5c06afd8ccd 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,10 +1,3 @@ -Template: dolibarr/reconfigure-webserver -Type: multiselect -Choices: apache2, lighttpd -_Description: Web server to reconfigure automatically: - Please choose the web server that should be automatically configured - to run dolibarr. - Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index f1527da165b..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.130 2011/08/03 00:47:37 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -306,23 +306,18 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; + #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; + #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; } # Build package for each target @@ -445,61 +440,57 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$FILENAMETGZ2"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; - print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n"; - $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\""; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; $ret=`$cmd`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; # Apache conf files - print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; - $ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`; + #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; # Dolibarr conf files # TODO @@ -524,21 +515,21 @@ if ($nboftargetok) { $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; # Build tgz @@ -575,11 +566,9 @@ if ($nboftargetok) { next; } - + if ($target eq 'DEB') { - $olddir=getcwd(); - $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -614,7 +603,7 @@ if ($nboftargetok) { $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; - open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error"; + open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -668,7 +657,6 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`; @@ -683,22 +671,19 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache and lighttpd conf files + # Apache conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; + + # Dolibarr conf files + # TODO # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -744,15 +729,17 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - # Creation of binary package (to build without sources) - #print "Go to directory $BUILDROOT\n"; - #chdir("$BUILDROOT"); + print "Go to directory $BUILDROOT\n"; + $olddir=getcwd(); + chdir("$BUILDROOT"); + + # Creation of binary package (to build without sources) #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Prepare source package + # Creation of source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -764,7 +751,6 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; - $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -780,9 +766,6 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; - - # Creation of source package - print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; 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/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/proxy.php b/htdocs/admin/proxy.php index f02e3d6203a..2c284c5cae8 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ */ require("../main.inc.php"); @@ -206,5 +205,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); +llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c0aaaa86213..c1d629f7b7b 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ */ require("../main.inc.php"); @@ -348,5 +347,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); +llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); ?> diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index a07b28bd2cf..f478b65e3a8 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.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/constall.php * \brief Page to show all Dolibarr setup (config file and database constants) - * \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $ + * \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $ */ require("../../main.inc.php"); 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/css/style.css b/htdocs/cashdesk/css/style.css index 698cceb4966..c79d46fbeb5 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,10 +11,11 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ +/* \version $Id$ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index 2d89cfd2388..f91946e11c0 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.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. */ // Instanciation et initialisation de l'objet xmlhttprequest 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/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/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 96de90124f9..259dc4dbce5 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -47,7 +48,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -66,7 +67,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -77,17 +78,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 5ba2ef8997e..0c262ba2936 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ */ require("./pre.inc.php"); @@ -386,5 +385,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); +llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 9ee1f551048..525160df9ef 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ */ require("./pre.inc.php"); @@ -608,5 +607,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); +llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); ?> diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 0efb704828f..e05eaa66ecf 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ + * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ */ require('../main.inc.php'); @@ -1031,5 +1032,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); +llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 5da397b4183..d2f2a7aae7e 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ + * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ */ require('../main.inc.php'); @@ -672,5 +673,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); +llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); ?> diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 689e2639773..79d00ae00c7 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ + * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -276,5 +275,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); +llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); ?> diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index e24b3c7c717..cb4a0f7a5cf 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -23,14 +23,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.193 2011/07/31 23:45:14 eldy Exp $ + * \version $Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $ */ @@ -160,10 +161,8 @@ class Form $htmltext=str_replace("\n","",$htmltext); $htmltext=str_replace('"',""",$htmltext); - if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip - else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag - if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip - else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip + $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag $s=""; if (empty($notabs)) $s.=''; diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 2ca2f82789e..8deeda0fb57 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/interfaces.class.php * \ingroup core * \brief Fichier de la classe de gestion des triggers - * \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $ */ diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 13a97bf54b3..3148174f5af 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,15 +20,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -65,7 +64,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 6f6c7ed2a1b..257b95e4e3c 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -64,7 +65,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.31 $'); + $ver=explode(' ','$Revision: 1.30 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 446606ef055..127eb16e389 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -63,7 +64,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
                      This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.28 $'); + $ver=explode(' ','$Revision: 1.27 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 46fa4c9ccc4..9c90d1fcc94 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,7 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program. If not, see . +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* or see http://www.gnu.org/ */ /** @@ -20,7 +22,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -59,7 +61,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
                      This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.14 $'); + $ver=explode(' ','$Revision$'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index 7055bef4b69..ec7e1af07c6 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ + * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/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/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index 067e831b0b4..b1e3f5a2638 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,503 +1,504 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index e5f0ff4c0e5..b1e3f5a2638 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,7 +484,8 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/index.php b/htdocs/index.php index 5998094d362..f027e94a35a 100644 --- a/htdocs/index.php +++ b/htdocs/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/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -574,7 +573,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); +llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 3724ef23d95..9b19d9793fc 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 1d2084e7c7f..9978c8f437a 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/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.24 2011/08/03 01:32:42 eldy Exp $ + * $Id$ */ body { diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 20ef1080e85..737e16cc10c 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 5d7fca530f2..c9713870c22 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index d7df4ac6929..e7b45a476f1 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 9a0dd0fcc43..62e0a4a90cf 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 0037190af06..50fa9904890 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ + * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 6d19b01e197..2e0fccb0051 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 3050d37833c..223a2eb6d92 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -75,10 +74,12 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +$lockfile = '../../install.lock'; +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; - +#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here +$lockfile = '../../install.lock'; if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -178,7 +179,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists('../../install.lock')) +if (file_exists($lockfile)) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
                      '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index c786f91346c..841136fff8b 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 275298588e2..9d08a56e41c 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,9 +17,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_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index da244f79951..56ceea3d807 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,9 +17,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_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index eee5dfa185a..3a248c2f49f 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,9 +18,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_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index e3922b97f65..dcbaf2faaf4 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,9 +17,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_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index b7f6c71c87e..1dd3cb59a62 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,9 +11,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_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index f3299990858..5e93e39d048 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,9 +17,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_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index 1f14cc8c142..e3ed8196d17 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,9 +17,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_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 5017ce0c60d..176e5c796e2 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,9 +17,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_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql index eeb2c376b85..ad7c175fcc4 100644 --- a/htdocs/install/mysql/data/llx_c_currencies.sql +++ b/htdocs/install/mysql/data/llx_c_currencies.sql @@ -17,9 +17,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_c_currencies.sql,v 1.8 2011/08/03 01:25:46 eldy Exp $ +-- $Id: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index f58db2b32a6..db630463dbf 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,9 +17,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_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index 079caa7dde4..c67d263853d 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,9 +17,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_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 4bb81528e74..07fa2abaa83 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,9 +18,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_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index 720413ac480..e29b3f306f5 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,9 +17,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_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index cb0b557b438..c7fa6b6dd1f 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.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_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index a3a19cc2125..6a597996424 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,9 +17,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_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 1ec498e6bc2..78e174b9817 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,9 +17,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_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a17978bb0c..3a535a5098e 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,9 +17,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_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index 96d456312df..f6395abbfcd 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,9 +17,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_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 488b0a564eb..9c28f697f83 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,9 +17,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_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index d8701c52c01..988d9c26136 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,9 +17,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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- @@ -33,4 +34,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2fd47385a90..2d1a3c62a39 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,9 +17,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_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 788e9e82f39..056dbdbdb6e 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -18,9 +18,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_c_tva.sql,v 1.27 2011/08/03 01:25:44 eldy Exp $ +-- $Id: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index da98640fd25..4238000eb14 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,9 +17,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_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 789ad16fce2..6e596be24e5 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,9 +17,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_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index 48b77951e1f..e2faed3cba3 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,9 +17,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_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index 59bd3d1ef00..cf7e9e96275 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,9 +17,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_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index cd2f27a5dca..655848a50ae 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.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: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 42f86f1c447..968a131e2bb 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -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: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 685170362fd..6e6e960072b 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.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_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 921bc569980..02ff06ba9f1 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.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_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index d5902b539c7..f22262c9353 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.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_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index ddd3d734ff7..b2cdf08af5f 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.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_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 8c5c23bbe62..031bfb614e1 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -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: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index f7b876eed86..3aa9555979e 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -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: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 8d34e2a9c78..4703aa32ddd 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -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: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index ad6f448e3dc..69bf706ca68 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,9 +15,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_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 51d66c04584..9156b439833 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,9 +15,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_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index 7df7f21a3b9..db64e0cbf9c 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -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: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index 31676d7d6e2..a7efcbd0f6d 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -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: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index bc9d9ad0936..7e4fa074e71 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -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: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index 18eed730ab8..d23a1367f92 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index ade41da746e..2b2db5af657 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index 62a88236480..b5c9175202b 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 015a9e9b4c0..6ed1e00dd88 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index 296b49fc93f..d1279c21eb2 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 9cedf70e7ca..822a69bc4ec 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index 55718d8ffb5..aba765190ee 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.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_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index abc9baa2d8c..eded16c49fe 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -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: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index 3dd83585bcd..e39fbf71f12 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -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: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 217edcaddbb..3710a87470a 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -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: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index 5869f24d8bd..ad41449f288 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -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: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index 5db17f19069..f6301a24919 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index 5f66ff625f0..cd68a9cdb40 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index b0546729ef0..890c7597862 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.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_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index 4794113f8bd..d67cf7fe4b8 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -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: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5fc25f57339..5c06c73c69d 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 5746cce26aa..115bd310d70 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index ba1e56e2b94..d3c71cc4a70 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.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_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index de9c23e9c05..10c4cc2d853 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,10 +13,11 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, 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_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index cce9d04707b..09365976d78 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.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_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 93e8e3d99a7..463b1235094 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -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: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index b0f31fe7116..c81a2b3e830 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -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: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index cb2251cfaf6..821fe3e5c04 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -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: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 8bebcf13116..9380607010d 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index b30354cae19..e524d9c937a 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index b026a40d762..0b0b34390c4 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -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: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 39d21cee7b9..7b5fa661d7d 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -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: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index d1e6b216b4b..e2f225fe608 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.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_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 60af7723f30..66cd5111325 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -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: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index cb223ae5532..ebca12ab5da 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -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: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 415b8526793..3872bedd39d 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -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: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index 5c54695f608..bed4ad41dfc 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 93ef5d59770..23cd0f575ed 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index 7702a8cf21e..f46d2a56c33 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.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_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_departements.sql b/htdocs/install/mysql/tables/llx_c_departements.sql index ea1f7543428..ab0ea5dc0c3 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.sql @@ -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: llx_c_departements.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id: llx_c_departements.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ -- ======================================================================== create table llx_c_departements diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 46a35567e95..4669de108f4 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.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_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index c2c43a3a625..a6bb8ca70f7 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -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: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 547500d7f33..5637e5a987d 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -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: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index bf7ed18af80..884d8274cfd 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.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_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index d0dceaf0fe1..2b6dea6cbd3 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -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: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 192183be0c1..76aecebbb9a 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -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: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index d6d673962b9..665a210d74b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -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: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index c8deefef6d7..7fcd57e31eb 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -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: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index 757653f1fc2..e1cab3b3368 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -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: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f2fb7fda4d3..f97e458be6b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -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: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 7a228ec1572..165a8550331 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -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: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 120e27ae77d..6efa388ef81 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.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_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index a5e3fd8721b..c8824b2d04e 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.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_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 418e37a85b1..311183c87f4 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.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_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 1cc5dbfaf0e..2d00f620e02 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -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: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 84c72e0839b..02052920c8a 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -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: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 8cf0ec900f8..0f608cbc171 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.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_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 2eed307bc54..75b40946559 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.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_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql index 5ef6fb221e6..d9d0f2d1b0c 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.sql @@ -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: llx_c_regions.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id: llx_c_regions.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ -- ======================================================================== create table llx_c_regions diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index c977dd9dd21..76caf44356d 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 8307ca88eb6..861671e3607 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -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: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 9a7bda88c28..46504e8a1c4 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -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: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index 725ddbfeb90..dc284fc8cea 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -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: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index a1feeb33f8b..4f8736a3a14 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -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. -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -23,7 +24,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 1e141b7768a..85ea592d950 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -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: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 79d54faf623..9fad6cc333e 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -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: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index 97638937c74..d6bd27758b4 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -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: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 211af70a854..40759cdc50b 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.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_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 7c4c534451d..80e73c43399 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -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: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index f2330322a5f..4c466e0c02b 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -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: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 8e4492c28a9..46a39b3c9e7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -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: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 39be52cf374..60641bf1876 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -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: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index e93ce9b4354..cfe126b5adf 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.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_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index baa01289b96..7e12e06beb7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -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: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index bd19d25f1a5..83eb804c875 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -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: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index eb95b9fe66c..6236e113766 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -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: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index 2c95fde3255..cf5121c34f9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -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: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index d62011351c4..cabdcce3a80 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index a07ff049d61..ebaf9582414 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index 730bc11ac98..fa9a85aac1f 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -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: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index 6f129f2feec..ec8931763bf 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -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: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 731cf8fb0f4..9c6e2a065f8 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -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: llx_commande.sql,v 1.14 2011/08/03 01:25:34 eldy Exp $ +-- $Id: llx_commande.sql,v 1.13 2011/07/28 22:22:31 eldy Exp $ -- =================================================================== create table llx_commande diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 172a2432ee1..7958b56f354 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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. -- --- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orphelins pour permettre mont�e de la cl� +-- Supprimme orphelins pour permettre monte de la cl -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index f1c8c7ac579..3ef51d6ae21 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -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: llx_commande_fournisseur.sql,v 1.8 2011/08/03 01:25:32 eldy Exp $ +-- $Id: llx_commande_fournisseur.sql,v 1.7 2011/07/28 22:22:31 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index c13c0aa6019..3f848c9ffe2 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index f0c65456e5c..df6d49827f6 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index be4e60a9a97..9bb45f9d326 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -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: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 23cfd068495..91914ab66c7 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -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: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b18165255..d1b39863cab 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -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: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index 19ec675f973..e964fbc2f5e 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -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: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a53a24d9a66..a747c714fb3 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.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_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 46639ca7c1e..16ecb365d6c 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.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_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index d1ba0645e05..bfce896eb19 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.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_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index b7fc52403af..51234007ee1 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.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_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index 4187f526393..eead2907fa2 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,9 +15,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_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 7b74d8b506d..1c757fa6c86 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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. -- --- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orhpelins pour permettre mont�e de la cl� +-- Supprimme orhpelins pour permettre monte de la cl -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index f1f4a75b604..79b52ba399c 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -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: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 39b89773316..3757e4522bf 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -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: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index 98b29b1f715..f5987250001 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -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: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 0eb566317d0..9c4a5e340ab 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 3fb9f7d6d2d..906d0a3e2f4 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index ba595100b5f..20bb329ff0e 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index b71d2697b85..2063a310fb8 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index 61d63046fac..a99b42859c7 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -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: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index 0e20201f4cb..f0e0a065089 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.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_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 154f0b51006..06af8a78575 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.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_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1dc4941012a..1c5d5c30173 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -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: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index a208aa5fff0..e43f4cb118c 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -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: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index f60029ee290..e4eb41f3bb4 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.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_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 2833920b746..463675b10b7 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -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: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index 7987ca819c1..fc998bd6edb 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.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_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index e027d471e23..1e9b0495d34 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -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: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ +-- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index 8b279dc578b..b899c4303e1 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.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_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 684c5aa5a7c..5d6d86617e6 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -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: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index cdccf3eb6ec..6de1b23eb64 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.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_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index fee45753759..04491e0878c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -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: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 9401f679071..575930a728c 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -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: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 757e8d2b447..46b769b8afc 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.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_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index d0118ebdc6c..e1b82141ea1 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 57d92bc8ce9..19824c860de 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 6f2ddcf56b9..455916a3010 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.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_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 6cf13137710..94e726796c5 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.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_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index cee3ace0ec3..8dbbb572f29 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -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: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 34d0bbac03b..923c2441987 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.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_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index ef97e48a251..88cf83a3cc3 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -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: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index b674a0cf11d..68e21d26061 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -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: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index 5e3620cba87..f289b9cb514 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -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: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index bd3c0c7d780..a2e54d34770 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -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: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index 1524eb7a77b..dbeec277f88 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -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: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index 75a4ce8fd06..e3e5900fb74 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.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_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index eafe6bd31e1..0669065b7d3 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -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: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index 6a06c0c70b5..dcca0174817 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -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: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index d4aa4b26d99..99cf1edd744 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.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_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index b55d734674f..415b44c6a35 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -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: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index 22a5b9d5c52..ba8b40b3c0a 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -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: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 5edbea4808d..40e131fefdf 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,9 +15,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_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index 5313952606a..bc11ca42c8f 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -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: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index c210f906b9b..8d4a4ecdcbf 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,9 +15,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_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index 29598bb4963..f43ab1e746a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.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_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index cfaad1061df..a52d3ed4a8b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -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: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 521d666742d..4e9f0d1da0e 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -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: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index 29af17f7c08..c9891219f4f 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,9 +15,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_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 917d6fc5cdf..6b8f7176dee 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -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: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 87245438b4d..399dd175311 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,9 +15,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_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index 373267c8921..c06074d4709 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,9 +15,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_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index b67427b9de8..1e3f21d0eb7 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.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_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 8f00ee95200..08450aa204f 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -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: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index edc76a392b0..9b0104ccfe5 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.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_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 302248ae299..0782e089170 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -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: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 9c741080a27..68b6cd9a315 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 4dd0ae15ad4..177be65fb88 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index ffc0666074d..d573c90eb18 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -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: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index 96f122e59cd..e0b2c2494ad 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -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: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 4beccac04b8..92000240642 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -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: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 484cebf6a2a..6240a2ed5c0 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -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: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index a56201f7dba..e2c4be38a5f 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -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: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 84f6077e5ba..51e133a86dc 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.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_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index 46685416239..aab9c69c1a7 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -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: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index 1d41d1ab59e..dc9732c0719 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -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: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index d6dd854a240..663adaffe60 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -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: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 0b7d6a61f56..73dc6489461 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -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: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index c1ee00edd07..0b42446740b 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.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_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index d694d696801..7d728850185 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -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: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index 925ca9eee81..d062249c3b8 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f67337de388..f33c92ea7fe 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 8c8454fbc28..92f21a35f28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.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_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index 6c673570cfc..e62275df23d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -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: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 9c05ed97a8d..29ad3853f90 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Oc�bo +-- Copyright (C) 2005 Marc Barilley / Ocbo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -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: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b127b194fa5..b9ba378d81f 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -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: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 5c8ea94ed09..8771b0ddda8 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.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_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 94ba92d4856..8bb011f7280 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.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_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 4017ae32682..1aba5d286d1 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -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: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index 2c77ae3447c..e0c4fd61701 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -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: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 52c0a3e2a03..1e721e86788 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.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_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index 439b2a68098..d4ea3ad5535 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.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_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index f01b7d02e8e..6f8d6a8cf97 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -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: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index bd1e805aed2..854ec6e826e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.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_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index bfc2162ceca..f1e90520593 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.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_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 784e3d37507..15d3bda5ba2 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -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: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 029bc528b6e..66a61851cae 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,9 +15,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_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 9c066c54436..195d2464738 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.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_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index f4e38524d25..44a301a2db7 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -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: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index f03d92ce651..237b5c23030 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.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_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 2c9c2d929db..3bec7551161 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index d9e9ecd43a7..45845593162 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 01cabfec865..672374961d5 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -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: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index 696cf49c337..d8d9443595d 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -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: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index 170bd56f390..f21fed4d1af 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -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: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index 5a3d71b489a..a501b4db4b6 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -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: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index d29449c2503..41a91a9aa5f 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.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_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index 86f114d395b..e12dbc6fb12 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -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: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index ce320558709..1a83bee6508 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -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: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 76f76ff08ed..93a28593f8e 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -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: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index 133687c7466..ec2bb01863b 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -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: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 6ccd3aa39fb..552a985abd4 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -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: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index e24a8918c5b..63b28ac8410 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -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: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index 26e451271cb..e7ccde53858 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -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: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index 40b07d29305..a1619df5cb5 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -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: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index e21669e63d7..309c60b660f 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.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_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index d094512d975..c92472f7af5 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -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: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index a75fb9aa76d..3fb70995900 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,9 +15,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_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ +-- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index a0d88737e3f..e7fc66a0ed6 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.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_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 9e28a37d6bb..57b252ed2ea 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -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: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index 376447586c9..b8453ea821c 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.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_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index e7528a03f28..00268974476 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -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: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 4f994cf57aa..16bf4dea7f0 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.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_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index 1a7fdfd755f..eff6387abee 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,9 +15,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_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index a618e3d8790..f53599483a4 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -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: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index 902f2b4fd5f..b9643f019c3 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.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_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index 1f5500e2eb1..db4cdd2581c 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -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: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index c7d84e27326..6bf45f749f5 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 523eb3b37e0..7db41de673c 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index bf057b4ad75..8dc4636c87e 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -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: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index ade6a40a80d..d500fc1b7cb 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.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_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index bca670bbb98..a515ba541bf 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -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: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index 7481589df00..b742b82dafc 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -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: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index 4adaa1a56ff..fff909a0ec8 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -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: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index 16631c76b76..fb65e9b7e84 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -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: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 3df14473a7e..332b1305d38 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.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_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index c3958313ea3..ca4206eb6fc 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -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: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 910d2ab2072..68e1d4f20e9 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -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: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 5c7f2e9a59c..8714e7e4a07 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -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: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index cbaadb10091..7d3b0eecd98 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.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_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index e88665b5a34..8bdd7193d1a 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -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: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 86916c216a2..367d45e8525 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -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: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 23065b261c8..28b28aeb762 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -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: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index 3f58eaf698b..d78db14c30b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -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: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 18924ff6ac5..68e46fd120d 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.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_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 8056a150fc3..6acb2db4585 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.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_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 1b5ea5516d4..838f502bfdb 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -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: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index e61985c7dd1..f21099e9c5e 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -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: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index 7bf81b7fbe9..f771be5ef5a 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.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_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 1fb0d708dfa..0033bca36bc 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.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_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 6df43634ec4..8037c9cd7e5 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -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: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 7b6cbd91645..99234b6660f 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index 810781ed6d9..dca8e80f856 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index 2e89f083575..f3a58aa1433 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.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_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index fd656c736ef..98c56c37567 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -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: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 87f6416c6c5..100d9fe82b0 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -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: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- ============================================================================ CREATE LANGUAGE plpgsql; 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/main.inc.php b/htdocs/main.inc.php index 49b67f9349a..1bdeb9562e6 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index eedd6a8841c..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/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index d6bf7267439..454073d9730 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 6e1e7b262f4..b5304ba4198 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index b0a7c2dece6..bda35165079 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.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/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ + * \version $Id$ */ if (session_id() == "") session_start(); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1da2adb751e..8bccf934120 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index a65f888ab11..efbd289cb3f 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ */ require("../main.inc.php"); @@ -1646,6 +1645,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); +llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 79601ea1031..8f373b577e8 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 8cf57ec0b64..724900dc500 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ + * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ */ require("../main.inc.php"); @@ -272,5 +271,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); +llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); ?> 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/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index e78dff8f646..f93935ffb16 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.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/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ + * \version $Id$ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal 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 $'); ?> From 08991b2a564753ac714ca9ab3b5a19c63b834483 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Aug 2011 13:26:21 +0000 Subject: [PATCH 065/118] Fix: rename inc to includes --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/control.DEBIAN | 46 - build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 + build/deb/install | 1 + build/deb/po/fr.po | 22 +- build/deb/po/templates.pot | 20 +- build/deb/postinst | 100 +- build/deb/postrm | 119 +- build/deb/templates | 7 + build/makepack-dolibarr.pl | 163 +-- 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 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 35 +- htdocs/admin/perms.php | 34 +- htdocs/admin/proxy.php | 7 +- htdocs/admin/security_other.php | 7 +- htdocs/admin/system/constall.php | 5 +- htdocs/boxes.php | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/tpl/menu.tpl.php | 13 +- htdocs/cashdesk/tpl/validation1.tpl.php | 21 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/compta/prelevement/create.php | 7 +- htdocs/core/class/conf.class.php | 9 +- htdocs/core/class/html.form.class.php | 11 +- htdocs/core/class/interfaces.class.php | 5 +- htdocs/filefunc.inc.php | 7 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 ++++++++--------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/index.php | 7 +- htdocs/install/check.php | 5 +- htdocs/install/default.css | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- .../install/mysql/data/llx_c_currencies.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/data/llx_c_tva.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_departements.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_regions.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- htdocs/install/mysql/tables/llx_commande.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../mysql/tables/llx_commande_fournisseur.sql | 5 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/lib/admin.lib.php | 77 +- htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 6 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- htdocs/societe/soc.php | 10 +- .../smartphone/theme/default/default.css.php | 5 +- htdocs/user/group/perms.php | 34 +- htdocs/user/perms.php | 32 +- 344 files changed, 1754 insertions(+), 1836 deletions(-) delete mode 100755 build/deb/control.DEBIAN diff --git a/build/deb/README b/build/deb/README index edb46ffd5a3..d73d7a99219 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build package +# dpkg -b To build binary only package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# +# dpkg-reconfigure -plow package Reconfigure package # dpkg -L packagename List content of installed package +# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index b035f18ae1d..3382966714b 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 + -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN deleted file mode 100755 index 7c66775bdf1..00000000000 --- a/build/deb/control.DEBIAN +++ /dev/null @@ -1,46 +0,0 @@ -Package: dolibarr -Version: __VERSION__ -Architecture: all -Maintainer: Laurent Destailleur -Installed-Size: 61200 -Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl -Section: web -Priority: optional -Homepage: http://www.dolibarr.org -Description: Easy to use web based ERP & CRM software - Dolibarr ERP & CRM is an easy to use open source/free software for small - and medium companies, foundations or freelances. It includes different - features for Enterprise Resource Planning (ERP) and Customer Relationship - Management (CRM) but also for different other activities. - It's a web software you can install as a standalone program or on any web - hosting provider to use it from anywhere with any web browser. - Dolibarr was designed to provide only features you need and be easy to use. - . - Only features you need are visible, depending on which module were activated. - Most common used modules are: - . - Customers, Suppliers or Prospects directory, - Contacts directory, - Orders management, - Commercial proposals management, - Invoices management, - Products and services catalog, - Stock management, - Foundations members management, - Bank accounts management, - Point of Sale, - Payments management, - Commercial actions management, - Contracts management, - Standing orders management, - Shipping management, - Donations management, - Bookmarks management, - Mass Emailings, - Reports, - Wizards to export and import data, - LDAP connectivity, - PDF exports, - And a lot of more modules... - . - You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index 91f0705c001..e28258d8dbc 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,10 +4,16 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper, po-debconf +Build-Depends: debhelper (>= 7), po-debconf Package: dolibarr -Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, + php5-mysql | php5-mysqli, + php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, + ${misc:Depends}, xdg-utils, + mysql-server, perl +Recommends: apache2 | lighttpd | httpd, mysql-client +Suggests: www-browser Architecture: all Section: web Priority: optional diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index a48e5048dff..f4b471edf13 100644 --- a/build/deb/dolibarr.desktop +++ b/build/deb/dolibarr.desktop @@ -3,10 +3,14 @@ # It must be saved into directory /usr/share/applications Version=1.0 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM +Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations +Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/deb/install b/build/deb/install index 4d41fd52c65..2928d378abc 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,4 +1,5 @@ etc/dolibarr/apache.conf +etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 13b8030ed0d..3bbe762283a 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:49+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,10 +25,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "Seveur web à reconfigurer automatiquement:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" +"Selectionnez le serveur web à configurer automatiquement pour utiliser " +"dolibarr." + # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -36,7 +52,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index 32c92a97cc4..d65e5d8b7f6 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:52+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,15 +17,29 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: multiselect #. Description #: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:2001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index ca5fd1645dd..e0bba1be4da 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,7 +1,5 @@ #!/bin/sh # postinst script for dolibarr -# -# see: dh_installdeb(1) set -e @@ -16,6 +14,31 @@ set -e # for details, see /usr/share/doc/packaging-manual/ + + +lighttpd_install() { + if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + if which lighty-enable-mod >/dev/null 2>&1 ; then + echo "Add link for Lighttpd config file" + ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf + # We enabled it + lighty-enable-mod dolibarr fastcgi-php + else + echo "Lighttpd not installed, skipping" + fi + fi +} + +apache_install() { + webserver=$1 + if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Add link for Apache config file" + ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + . /usr/share/debconf/confmodule db_version 2.0 @@ -27,8 +50,6 @@ 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" @@ -44,10 +65,6 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir - # Copy apache.conf file into target directory - #mkdir -p /etc/dolibarr - #cp -p $apachefileorig $apacheconfig - # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -74,21 +91,15 @@ case "$1" in chmod -R 660 $config fi - # Get the web server type (use db_get for interactive mode). - #db_reset "dolibarr/webserver" - #db_get "dolibarr/webserver" # Read value for webserver. - #webserver="$RET" - - case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; - esac - + + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + # Set up web server. - for server in $webservers ; do - echo Complete config of server $server + for webserver in $webservers ; do + webserver=${webserver%,} + echo Complete config of server $webserver # Detect webuser and webgroup webuser= @@ -106,26 +117,31 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config - - # Add link to config file - echo Setup web server $server to add dolibarr config file - ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf - done - # Restart servers - servers="apache2-ssl apache2 mysql" - # Another way to restart - for server in $servers ; do - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $server reload || true - else - echo Restart web server $server using $server reload - /etc/init.d/$server reload || true - fi + # Restart web server. + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_install + else + apache_install $webserver + fi + # Reload webserver in any case, configuration might have changed + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $webserver reload 3>/dev/null || true + else + echo Restart web server $server using $server reload + /etc/init.d/$webserver reload 3>/dev/null || true + fi + fi done + echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -136,13 +152,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument $1" >&2 exit 0 ;; esac -db_stop - #DEBHELPER# +db_stop + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 9eae81b022b..27ce3777b7e 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,7 +17,36 @@ set -e # for details, see /usr/share/doc/packaging-manual/ -. /usr/share/debconf/confmodule + +lighttpd_remove() { + if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + echo "Remove link for Lighttpd config file" + rm -f /etc/lighttpd/conf-available/50-dolibarr.conf + if which lighty-enable-mod >/dev/null 2>&1 ; then + lighty-disable-mod dolibarr + else + echo "Lighttpd not installed, skipping" + fi + # See bug #448682 + if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then + echo 'Manually deleting lighttpd/dolibarr configuration link' + rm /etc/lighttpd/conf-enabled/50-dolibarr.conf + fi + fi +} + +apache_remove() { + if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Remove link for Apache config file" + rm -f /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi db_version 2.0 @@ -26,63 +55,62 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' -apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" -apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" -export webserver="" -# Allows us to loop and substitute in one pass -case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; -esac - case "$1" in # Call when we upgrade upgrade) + echo "postrm upgrade" ;; # Call when we uninstall remove) + echo "postrm remove" rm -f $lockfile - # 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" + # Reconfigure web server + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + + # Restart web servers + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_remove + else + apache_remove $webserver + fi + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload 3>/dev/null || true + else + /etc/init.d/$webserver reload 3>/dev/null || true + fi fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" + echo "postrm purge" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical "dolibarr/postrm" || true + db_input critical dolibarr/postrm || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get "dolibarr/postrm" + db_get dolibarr/postrm set -e if [ "$RET" = "true" ] ; then @@ -185,41 +213,12 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi - # Remove include files - export restart="" - for server in $webservers ; do - export conffile="/etc/$server/conf.d/dolibarr.conf" - if [ -f $conffile ] ; - then - echo Delete file $conffile - rm -f $conffile - status=purge - fi - - if [ "x$status" = "xpurge" ] ; - then restart="$restart $server" - fi - done - rm -rf /etc/dolibarr - # Restart servers - for server in $restart ; do - # We disable blocking errors - set +e - echo "Restart server $server if exists" - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $server reload || true - else - /etc/init.d/$server reload || true - fi - # We restore blocking errors - set -e - done - # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset "dolibarr/postrm" + db_reset dolibarr/reconfigure-webserver + db_reset dolibarr/postrm set -e #db_purge @@ -229,7 +228,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "postrm called with unknown argument $1" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index 5c06afd8ccd..b96325a4e64 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,3 +1,10 @@ +Template: dolibarr/reconfigure-webserver +Type: multiselect +Choices: apache2, lighttpd +_Description: Web server to reconfigure automatically: + Please choose the web server that should be automatically configured + to run dolibarr. + Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index d3c47e6b28d..f1527da165b 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.130 2011/08/03 00:47:37 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -306,18 +306,23 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; - #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; - #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; } # Build package for each target @@ -440,57 +445,61 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$FILENAMETGZ2"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; + print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n"; + $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\""; $ret=`$cmd`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; # Apache conf files - #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; - #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + $ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`; # Dolibarr conf files # TODO @@ -515,21 +524,21 @@ if ($nboftargetok) { $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; # Build tgz @@ -566,9 +575,11 @@ if ($nboftargetok) { next; } - + if ($target eq 'DEB') { + $olddir=getcwd(); + $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -603,7 +614,7 @@ if ($nboftargetok) { $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; - open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; + open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -657,6 +668,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`; @@ -671,19 +683,22 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache conf files + # Apache and lighttpd conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - - # Dolibarr conf files - # TODO + print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -729,17 +744,15 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - print "Go to directory $BUILDROOT\n"; - $olddir=getcwd(); - chdir("$BUILDROOT"); - - # Creation of binary package (to build without sources) + # Creation of binary package (to build without sources) + #print "Go to directory $BUILDROOT\n"; + #chdir("$BUILDROOT"); #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Creation of source package + # Prepare source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -751,6 +764,7 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; + $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -766,6 +780,9 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; + + # Creation of source package + print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/build/rpm/README b/build/rpm/README index 99a1bb3552c..f20bf91db72 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -5,17 +5,24 @@ RPM Package tools This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, -with format RPM (for Redhat, Mandriva, ...). +with format RPM (for Redhat, OpenSuse, Mandriva, ...). -# This is standard command to work on Debian packaging: +# This is standard command to work on RPM packaging: +# +# yum -y install rpmlint +# yum -y install hunspell-en hunspell-es hunspell-fr hunspell-it # # rpmlint file.rpm Test a package +# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm # # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies -# yum erase dolibarr To remove package +# yum erase dolibarr To remove package +# chcon -R -h -t httpd_sys_script_rw_t /file To add temporary context rw for httpd on /file +# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" To add persistent context rw for httpd on /dir (this add file_contexts.local) +# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage) # # On OpenSuse # yast --install dolibarr-...rpm To install package and dependencies diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index 4b4fb60dadb..337b92d8049 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -4,13 +4,14 @@ Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti -Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 708546cf263..08fe933d774 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -5,6 +5,11 @@ # file to build a package for your own distributions and # edit it if you need to match your rules. # -------------------------------------------------------- + +#%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0) +#%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) +#%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0) + %define name dolibarr %define version __VERSION__ %define release __RELEASE__ @@ -12,9 +17,12 @@ Name: %{name} Version: %{version} Release: %{release} -Summary: Dolibarr +Summary: ERP and CRM software for small and medium companies or foundations +Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos +Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations +Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti -License: GPL +License: GPLv2+ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team @@ -56,13 +64,12 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Un software ERP y CRM open source/gratis para pequeñas y -medianas empresas, asociaciones o autónomos. Incluye diferentes -funcionalidades para la Planificación de Recursos Empresariales (ERP) y -Gestión de la Relación con los Clientes (CRM) así como para para otras -diferentes actividades. Dolibarr ha sido diseñado para suministrarle -solamente las funcionalidades que necesita y haciendo hincapié en su -facilidad de uso. +Un software ERP y CRM para pequeñas y medianas empresas, asociaciones +o autónomos. Incluye diferentes funcionalidades para la Planificación +de Recursos Empresariales (ERP) y Gestión de la Relación con los +Clientes (CRM) así como para para otras diferentes actividades. +Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades +que necesita y haciendo hincapié en su facilidad de uso. %description -l fr Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, @@ -71,12 +78,12 @@ fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Un programma gestionale open source e gratuito per piccole e medie +Un programmo gestionale per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori -attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno +attività. Progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. -Dolibar è completamente web-based, progettato per poter fornire solo ciò di +Programmo web, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. @@ -94,49 +101,51 @@ echo Building %{name}-%{version}-%{release} #---- install %install -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr +%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf +%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr # %{_datadir} = /usr/share -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +%{__install} -m 644 var/www/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications +%{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README -install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/doc $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/htdocs $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT #---- clean %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT #---- files %files + %defattr(-,root,root) -%doc README -%doc COPYRIGHT %doc /var/www/dolibarr/doc/* %dir /var/www/dolibarr/build %dir /var/www/dolibarr/htdocs %dir /var/www/dolibarr/scripts -%_datadir/pixmaps/* +%_datadir/pixmaps/dolibarr.png %_datadir/applications/%{name}.desktop /var/www/dolibarr/build/* /var/www/dolibarr/htdocs/* /var/www/dolibarr/scripts/* -/var/www/dolibarr/README -/var/www/dolibarr/COPYRIGHT -#%config /var/www/dolibarr/htdocs/conf/conf.php + +%defattr(0664, -, -, 0755) +%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf +%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr #---- post (after unzip during install) @@ -154,11 +163,11 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr" +export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="/usr/share/dolibarr/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="/usr/share/dolibarr/install.lock" # Detect OS @@ -192,8 +201,8 @@ echo OS detected: $os # Create empty directory for uploaded files and generated documents echo Create document directory $docdir -mkdir -p $docdir -mkdir -p %{_sysconfdir}/dolibarr +%{__mkdir} -p $docdir +%{__mkdir} -p %{_sysconfdir}/dolibarr # Create install.forced.php into Dolibarr install directory superuserlogin='' @@ -205,12 +214,12 @@ if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then fi echo Mysql superuser found to use is $superuserlogin if [ -z "$superuserlogin" ] ; then - cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig + %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig else - cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig + %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig fi -chown -R root:$apachegroup $installconfig -chmod -R 660 $installconfig +%{__chown} -R root:$apachegroup $installconfig +%{__chmod} -R 660 $installconfig # Create an empty conf.php with permission to web server if [ ! -f $config ] @@ -222,19 +231,20 @@ then fi # Create config file for apache $apacheconfig -if [ ! -f $apacheconfig ]; then - echo Create dolibarr web server config file $apacheconfig - cp $apachefileorig $apacheconfig - chmod a-x $apacheconfig - chmod go-w $apacheconfig -fi - -# Create config file for se $seconfig -if [ ! -f $seconfig ]; then - echo Create se config file $seconfig - cp $sefileorig $seconfig +#if [ ! -f $apacheconfig ]; then +# echo Create dolibarr web server config file $apacheconfig +# cp $apachefileorig $apacheconfig # chmod a-x $apacheconfig # chmod go-w $apacheconfig +#fi + +# Create config file for se $seconfig +if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then + echo Add SE Linux permission from file $sefileorig +# cp $sefileorig $seconfig + restorecon -R -v /etc/dolibarr + restorecon -R -v /var/www/dolibarr + restorecon -R -v /usr/share/dolibarr fi # Create a config link dolibarr.conf @@ -253,18 +263,6 @@ echo Set permission to $apacheuser:$apachegroup on $docdir chown -R $apacheuser:$apachegroup $docdir chmod -R o-w $docdir -# Set SE Linux on OS SE is enabled -if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then - echo Set SELinux permissions - # Warning: chcon seems not cumulative - #chcon -R -h -t httpd_sys_content_t $targetdir - #chcon -R -h -t httpd_sys_content_t $docdir - chcon -R -h -t httpd_sys_script_rw_t $targetdir - chcon -R -h -t httpd_sys_script_rw_t $docdir - chcon -R -h -t httpd_sys_script_rw_t %{_sysconfdir}/dolibarr - #chcon -R -h -t httpd_sys_script_exec_t $targetdir -fi - # Restart web server echo Restart web server if [ -f %{_sysconfdir}/init.d/httpd ]; then @@ -274,6 +272,12 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then %{_sysconfdir}/init.d/apache2 restart fi +# Restart mysql +echo Restart mysql +if [ -f /etc/init.d/mysqld ]; then + /etc/init.d/mysqld restart +fi + # Show result echo echo "----- Dolibarr %version - (c) Dolibarr dev team -----" @@ -301,9 +305,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="$targetdir/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="$targetdir/install.lock" # Detect OS @@ -338,7 +342,7 @@ echo OS detected: $os if [ -f $apachelink ] ; then echo Delete apache config link for Dolibarr - rm -f $apachelink + %{__rm} -f $apachelink status=purge fi @@ -356,18 +360,15 @@ then fi # Removed dirs after apache restart -echo Removed remaining $apacheconfig -rm -f $apacheconfig echo Removed remaining $config -rm -f $config +%{__rm} -f $config echo Removed remaining $installconfig -rm -f $installconfig +%{__rm} -f $installconfig echo Removed remaining $lockfile -rm -f $lockfile +%{__rm} -f $lockfile echo Removed remaining dir $targetdir/doc rmdir $targetdir/doc >/dev/null 2>&1 -#echo Removed remaining dir $targetdir/htdocs -#rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm + %changelog * Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 diff --git a/build/rpm/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr index 64376e5afb6..193a43b7dbe 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -1,3 +1,3 @@ -/etc/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/var/www/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file +/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/var/www/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 3cc548e1c0a..d7172d651f0 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -27,7 +27,7 @@ * \file htdocs/includes/modules/modMyModule.class.php * \ingroup mymodule * \brief Description and activation file for module MyModule - * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $ + * \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); @@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='generic'; - // Defined if the directory /mymodule/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 718c842d046..34e7f48cea8 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -20,7 +20,7 @@ /** * \file htdocs/admin/boxes.php * \brief Page to setup boxes - * \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $ */ require("../main.inc.php"); @@ -278,7 +278,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -394,7 +394,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -470,5 +470,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $'); +llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $'); ?> diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index a907f47663a..671bd69a0e4 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2010 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ /** * \file htdocs/admin/modules.php * \brief Page to activate/disable all modules - * \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $ */ require("../main.inc.php"); @@ -79,12 +79,35 @@ $modules = array(); $orders = array(); $categ = array(); $dirmod = array(); +$modulesdir = array(); $i = 0; // is a sequencer of modules found $j = 0; // j is module number. Automatically affected if module number not defined. -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $althandle=@opendir($dirroot); + if (is_resource($althandle)) + { + while (($file = readdir($althandle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                      "; dol_syslog("Scan directory ".$dir." for modules"); @@ -449,5 +472,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $'); +llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $'); ?> diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index bee00b52906..6af9b54e7f0 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -21,7 +21,7 @@ * \file htdocs/admin/perms.php * \ingroup core * \brief Page d'administration/configuration des permissions par defaut - * \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $ + * \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $ */ require("../main.inc.php"); @@ -76,10 +76,34 @@ $db->begin(); // Charge les modules soumis a permissions $modules = array(); -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +$modulesdir = array(); +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                      "; $handle=@opendir($dir); @@ -194,5 +218,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $'); +llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $'); ?> diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 2c284c5cae8..f02e3d6203a 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ + * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -205,5 +206,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c1d629f7b7b..c0aaaa86213 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -347,5 +348,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index f478b65e3a8..a07b28bd2cf 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/system/constall.php * \brief Page to show all Dolibarr setup (config file and database constants) - * \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $ + * \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $ */ require("../../main.inc.php"); diff --git a/htdocs/boxes.php b/htdocs/boxes.php index 2affdf654d3..d426e618377 100644 --- a/htdocs/boxes.php +++ b/htdocs/boxes.php @@ -22,7 +22,7 @@ * \brief File of class to manage widget boxes * \author Rodolphe Qiedeville * \author Laurent Destailleur - * \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $ */ @@ -220,7 +220,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php"); + $sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); } else { @@ -281,7 +281,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index c79d46fbeb5..698cceb4966 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,11 +11,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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ -/* \version $Id$ */ +/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index f91946e11c0..2d89cfd2388 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.js @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ // Instanciation et initialisation de l'objet xmlhttprequest diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 83dac68a99e..8b82c9f8249 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); @@ -63,11 +62,13 @@ $logout=''; print '
                        '; +// Link to new sell print '
                      • '.$langs->trans("NewSell").'
                        • '; - -print '
                      • '.$langs->trans("BackOffice").'
                        • '; - -print '
                      • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' '.$logout.'
                        '; +// Open new tab on backoffice (this is not a disconnect from POS) +print '
                      • '.$langs->trans("BackOffice").'
                        • '; +// Disconnect +print '
                      • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom']; +print ' '.$logout.'
                        '; print $langs->trans("CashDeskThirdParty").': '.$companyLink.'
                        '; /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'
                        '; print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'
                        '; diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index f3a440b4929..b18bf124ae4 100644 --- a/htdocs/cashdesk/tpl/validation1.tpl.php +++ b/htdocs/cashdesk/tpl/validation1.tpl.php @@ -15,8 +15,7 @@ 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, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with this program. If not, see . -->
                        trans("Summary"); ?> @@ -40,9 +39,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ?> trans("TotalTTC"); ?> prix_total_ttc(),'MT').' '.$conf->monnaie; ?> trans("PaymentMode"); ?> - mode_reglement()) - { + { case 'ESP': echo $langs->trans("Cash"); $filtre='courant=2'; @@ -53,7 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 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"); @@ -65,16 +64,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. echo $langs->trans("Reported"); $filtre='courant=1 OR courant=2'; $selected=''; - break; + break; default: $filtre='courant=1 OR courant=2'; $selected=''; } - + ?> - - mode_reglement() == 'DIF' ) { @@ -100,10 +99,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

                        - 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/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 259dc4dbce5..96de90124f9 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -48,7 +47,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -67,7 +66,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -78,17 +77,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 0c262ba2936..5ba2ef8997e 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -385,5 +386,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 525160df9ef..9ee1f551048 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ + * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -607,5 +608,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index e05eaa66ecf..0efb704828f 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ + * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -1032,5 +1031,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index d2f2a7aae7e..5da397b4183 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ + * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ */ require('../main.inc.php'); @@ -673,5 +672,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); +llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); ?> diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 79d00ae00c7..689e2639773 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ + * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -275,5 +276,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); +llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index e6559c2ae2e..c5664164e74 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -16,8 +16,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -25,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $ + * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ */ @@ -145,13 +144,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard + $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard + $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/'; } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index cb4a0f7a5cf..e24b3c7c717 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -23,15 +23,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $ + * \version $Id: html.form.class.php,v 1.193 2011/07/31 23:45:14 eldy Exp $ */ @@ -161,8 +160,10 @@ class Form $htmltext=str_replace("\n","",$htmltext); $htmltext=str_replace('"',""",$htmltext); - $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip - $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip + else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip + else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag $s=""; if (empty($notabs)) $s.=''; diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 8deeda0fb57..2ca2f82789e 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/interfaces.class.php * \ingroup core * \brief Fichier de la classe de gestion des triggers - * \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $ + * \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $ */ diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 3148174f5af..13a97bf54b3 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,14 +20,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -64,7 +65,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 257b95e4e3c..6f6c7ed2a1b 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -65,7 +64,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.30 $'); + $ver=explode(' ','$Revision: 1.31 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 127eb16e389..446606ef055 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -64,7 +63,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
                        This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.27 $'); + $ver=explode(' ','$Revision: 1.28 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 9c90d1fcc94..46fa4c9ccc4 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,9 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* or see http://www.gnu.org/ +* along with this program. If not, see . */ /** @@ -22,7 +20,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id$ + * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -61,7 +59,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
                        This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision$'); + $ver=explode(' ','$Revision: 1.14 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index ec7e1af07c6..7055bef4b69 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php index 42780551928..c7bab37ad4b 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.10 2011/07/31 23:28:10 eldy Exp $ + * \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis 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/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 1; // Data directories to create when module is enabled diff --git a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index b1e3f5a2638..067e831b0b4 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,504 +1,503 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; If not, see . + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index b1e3f5a2638..e5f0ff4c0e5 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + License along with this library; If not, see . Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/index.php b/htdocs/index.php index f027e94a35a..5998094d362 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -573,7 +574,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); +llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9b19d9793fc..3724ef23d95 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 9978c8f437a..1d2084e7c7f 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: default.css,v 1.24 2011/08/03 01:32:42 eldy Exp $ */ body { diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 737e16cc10c..20ef1080e85 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ + * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index c9713870c22..5d7fca530f2 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index e7b45a476f1..d7df4ac6929 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 62e0a4a90cf..9a0dd0fcc43 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ + * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 50fa9904890..0037190af06 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 2e0fccb0051..6d19b01e197 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ + * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 223a2eb6d92..3050d37833c 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -74,12 +75,10 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -$lockfile = '../../install.lock'; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; -#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here -$lockfile = '../../install.lock'; + if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -179,7 +178,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists($lockfile)) +if (file_exists('../../install.lock')) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
                        '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index 841136fff8b..c786f91346c 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ + * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 9d08a56e41c..275298588e2 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index 56ceea3d807..da244f79951 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index 3a248c2f49f..eee5dfa185a 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index dcbaf2faaf4..e3922b97f65 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index 1dd3cb59a62..b7f6c71c87e 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,10 +11,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index 5e93e39d048..f3299990858 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index e3ed8196d17..1f14cc8c142 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 176e5c796e2..5017ce0c60d 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql index ad7c175fcc4..eeb2c376b85 100644 --- a/htdocs/install/mysql/data/llx_c_currencies.sql +++ b/htdocs/install/mysql/data/llx_c_currencies.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_c_currencies.sql,v 1.8 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index db630463dbf..f58db2b32a6 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index c67d263853d..079caa7dde4 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 07fa2abaa83..4bb81528e74 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index e29b3f306f5..720413ac480 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index c7fa6b6dd1f..cb0b557b438 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index 6a597996424..a3a19cc2125 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 78e174b9817..1ec498e6bc2 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a535a5098e..3a17978bb0c 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index f6395abbfcd..96d456312df 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 9c28f697f83..488b0a564eb 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index 988d9c26136..d8701c52c01 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ -- -- @@ -34,4 +33,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2d1a3c62a39..2fd47385a90 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 056dbdbdb6e..788e9e82f39 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_c_tva.sql,v 1.27 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index 4238000eb14..da98640fd25 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 6e596be24e5..789ad16fce2 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index e2faed3cba3..48b77951e1f 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index cf7e9e96275..59bd3d1ef00 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index 655848a50ae..cd2f27a5dca 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 968a131e2bb..42f86f1c447 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 6e6e960072b..685170362fd 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 02ff06ba9f1..921bc569980 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index f22262c9353..d5902b539c7 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index b2cdf08af5f..ddd3d734ff7 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 031bfb614e1..8c5c23bbe62 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index 3aa9555979e..f7b876eed86 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 4703aa32ddd..8d34e2a9c78 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index 69bf706ca68..ad6f448e3dc 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 9156b439833..51d66c04584 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index db64e0cbf9c..7df7f21a3b9 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index a7efcbd0f6d..31676d7d6e2 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index 7e4fa074e71..bc9d9ad0936 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index d23a1367f92..18eed730ab8 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index 2b2db5af657..ade41da746e 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index b5c9175202b..62a88236480 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 6ed1e00dd88..015a9e9b4c0 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index d1279c21eb2..296b49fc93f 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 822a69bc4ec..9cedf70e7ca 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index aba765190ee..55718d8ffb5 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index eded16c49fe..abc9baa2d8c 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index e39fbf71f12..3dd83585bcd 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 3710a87470a..217edcaddbb 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index ad41449f288..5869f24d8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index f6301a24919..5db17f19069 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index cd68a9cdb40..5f66ff625f0 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index 890c7597862..b0546729ef0 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index d67cf7fe4b8..4794113f8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5c06c73c69d..5fc25f57339 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 115bd310d70..5746cce26aa 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index d3c71cc4a70..ba1e56e2b94 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index 10c4cc2d853..de9c23e9c05 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,11 +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, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- --- $Id$ +-- $Id: llx_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index 09365976d78..cce9d04707b 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 463b1235094..93e8e3d99a7 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index c81a2b3e830..b0f31fe7116 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index 821fe3e5c04..cb2251cfaf6 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 9380607010d..8bebcf13116 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index e524d9c937a..b30354cae19 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index 0b0b34390c4..b026a40d762 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 7b5fa661d7d..39d21cee7b9 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index e2f225fe608..d1e6b216b4b 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 66cd5111325..60af7723f30 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index ebca12ab5da..cb223ae5532 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 3872bedd39d..415b8526793 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index bed4ad41dfc..5c54695f608 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 23cd0f575ed..93ef5d59770 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index f46d2a56c33..7702a8cf21e 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_departements.sql b/htdocs/install/mysql/tables/llx_c_departements.sql index ab0ea5dc0c3..ea1f7543428 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_departements.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ +-- $Id: llx_c_departements.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_c_departements diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 4669de108f4..46a35567e95 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index a6bb8ca70f7..c2c43a3a625 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 5637e5a987d..547500d7f33 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index 884d8274cfd..bf7ed18af80 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index 2b6dea6cbd3..d0dceaf0fe1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 76aecebbb9a..192183be0c1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index 665a210d74b..d6d673962b9 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index 7fcd57e31eb..c8deefef6d7 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index e1cab3b3368..757653f1fc2 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f97e458be6b..f2fb7fda4d3 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 165a8550331..7a228ec1572 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 6efa388ef81..120e27ae77d 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index c8824b2d04e..a5e3fd8721b 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 311183c87f4..418e37a85b1 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 2d00f620e02..1cc5dbfaf0e 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 02052920c8a..84c72e0839b 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 0f608cbc171..8cf0ec900f8 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 75b40946559..2eed307bc54 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql index d9d0f2d1b0c..5ef6fb221e6 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_regions.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ +-- $Id: llx_c_regions.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_c_regions diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index 76caf44356d..c977dd9dd21 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 861671e3607..8307ca88eb6 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 46504e8a1c4..9a7bda88c28 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index dc284fc8cea..725ddbfeb90 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index 4f8736a3a14..a1feeb33f8b 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -13,8 +13,7 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -24,7 +23,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 85ea592d950..1e141b7768a 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 9fad6cc333e..79d54faf623 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index d6bd27758b4..97638937c74 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 40759cdc50b..211af70a854 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 80e73c43399..7c4c534451d 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index 4c466e0c02b..f2330322a5f 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 46a39b3c9e7..8e4492c28a9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 60641bf1876..39be52cf374 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index cfe126b5adf..e93ce9b4354 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index 7e12e06beb7..baa01289b96 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index 83eb804c875..bd19d25f1a5 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index 6236e113766..eb95b9fe66c 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index cf5121c34f9..2c95fde3255 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index cabdcce3a80..d62011351c4 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index ebaf9582414..a07ff049d61 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index fa9a85aac1f..730bc11ac98 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index ec8931763bf..6f129f2feec 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 9c6e2a065f8..731cf8fb0f4 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_commande.sql,v 1.13 2011/07/28 22:22:31 eldy Exp $ +-- $Id: llx_commande.sql,v 1.14 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_commande diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 7958b56f354..172a2432ee1 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ --- Supprimme orphelins pour permettre monte de la cl +-- Supprimme orphelins pour permettre mont�e de la cl� -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index 3ef51d6ae21..f1c8c7ac579 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_commande_fournisseur.sql,v 1.7 2011/07/28 22:22:31 eldy Exp $ +-- $Id: llx_commande_fournisseur.sql,v 1.8 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index 3f848c9ffe2..c13c0aa6019 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index df6d49827f6..f0c65456e5c 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index 9bb45f9d326..be4e60a9a97 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 91914ab66c7..23cfd068495 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b39863cab..d1b18165255 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index e964fbc2f5e..19ec675f973 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a747c714fb3..a53a24d9a66 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 16ecb365d6c..46639ca7c1e 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index bfce896eb19..d1ba0645e05 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index 51234007ee1..b7fc52403af 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index eead2907fa2..4187f526393 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 1c757fa6c86..7b74d8b506d 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ --- Supprimme orhpelins pour permettre monte de la cl +-- Supprimme orhpelins pour permettre mont�e de la cl� -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index 79b52ba399c..f1f4a75b604 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 3757e4522bf..39b89773316 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index f5987250001..98b29b1f715 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 9c4a5e340ab..0eb566317d0 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 906d0a3e2f4..3fb9f7d6d2d 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index 20bb329ff0e..ba595100b5f 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index 2063a310fb8..b71d2697b85 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index a99b42859c7..61d63046fac 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index f0e0a065089..0e20201f4cb 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 06af8a78575..154f0b51006 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1c5d5c30173..1dc4941012a 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index e43f4cb118c..a208aa5fff0 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index e4eb41f3bb4..f60029ee290 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 463675b10b7..2833920b746 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index fc998bd6edb..7987ca819c1 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index 1e9b0495d34..e027d471e23 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ +-- $Id: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index b899c4303e1..8b279dc578b 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 5d6d86617e6..684c5aa5a7c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index 6de1b23eb64..cdccf3eb6ec 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index 04491e0878c..fee45753759 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 575930a728c..9401f679071 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 46b769b8afc..757e8d2b447 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index e1b82141ea1..d0118ebdc6c 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 19824c860de..57d92bc8ce9 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 455916a3010..6f2ddcf56b9 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 94e726796c5..6cf13137710 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index 8dbbb572f29..cee3ace0ec3 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 923c2441987..34d0bbac03b 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index 88cf83a3cc3..ef97e48a251 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index 68e21d26061..b674a0cf11d 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index f289b9cb514..5e3620cba87 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index a2e54d34770..bd3c0c7d780 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index dbeec277f88..1524eb7a77b 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index e3e5900fb74..75a4ce8fd06 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index 0669065b7d3..eafe6bd31e1 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index dcca0174817..6a06c0c70b5 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index 99cf1edd744..d4aa4b26d99 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index 415b44c6a35..b55d734674f 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index ba8b40b3c0a..22a5b9d5c52 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 40e131fefdf..5edbea4808d 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index bc11ca42c8f..5313952606a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index 8d4a4ecdcbf..c210f906b9b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index f43ab1e746a..29598bb4963 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index a52d3ed4a8b..cfaad1061df 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 4e9f0d1da0e..521d666742d 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index c9891219f4f..29af17f7c08 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 6b8f7176dee..917d6fc5cdf 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 399dd175311..87245438b4d 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index c06074d4709..373267c8921 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index 1e3f21d0eb7..b67427b9de8 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 08450aa204f..8f00ee95200 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index 9b0104ccfe5..edc76a392b0 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 0782e089170..302248ae299 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 68b6cd9a315..9c741080a27 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 177be65fb88..4dd0ae15ad4 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index d573c90eb18..ffc0666074d 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index e0b2c2494ad..96f122e59cd 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 92000240642..4beccac04b8 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 6240a2ed5c0..484cebf6a2a 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index e2c4be38a5f..a56201f7dba 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 51e133a86dc..84f6077e5ba 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index aab9c69c1a7..46685416239 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index dc9732c0719..1d41d1ab59e 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index 663adaffe60..d6dd854a240 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 73dc6489461..0b7d6a61f56 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index 0b42446740b..c1ee00edd07 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index 7d728850185..d694d696801 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index d062249c3b8..925ca9eee81 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f33c92ea7fe..f67337de388 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 92f21a35f28..8c8454fbc28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index e62275df23d..6c673570cfc 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 29ad3853f90..9c05ed97a8d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Ocbo +-- Copyright (C) 2005 Marc Barilley / Oc�bo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b9ba378d81f..b127b194fa5 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 8771b0ddda8..5c8ea94ed09 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 8bb011f7280..94ba92d4856 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 1aba5d286d1..4017ae32682 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index e0c4fd61701..2c77ae3447c 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 1e721e86788..52c0a3e2a03 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index d4ea3ad5535..439b2a68098 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index 6f8d6a8cf97..f01b7d02e8e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index 854ec6e826e..bd1e805aed2 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index f1e90520593..bfc2162ceca 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 15d3bda5ba2..784e3d37507 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 66a61851cae..029bc528b6e 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 195d2464738..9c066c54436 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index 44a301a2db7..f4e38524d25 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index 237b5c23030..f03d92ce651 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 3bec7551161..2c9c2d929db 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index 45845593162..d9e9ecd43a7 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 672374961d5..01cabfec865 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index d8d9443595d..696cf49c337 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index f21fed4d1af..170bd56f390 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index a501b4db4b6..5a3d71b489a 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index 41a91a9aa5f..d29449c2503 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index e12dbc6fb12..86f114d395b 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index 1a83bee6508..ce320558709 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 93a28593f8e..76f76ff08ed 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index ec2bb01863b..133687c7466 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 552a985abd4..6ccd3aa39fb 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index 63b28ac8410..e24a8918c5b 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index e7ccde53858..26e451271cb 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index a1619df5cb5..40b07d29305 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index 309c60b660f..e21669e63d7 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index c92472f7af5..d094512d975 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index 3fb70995900..a75fb9aa76d 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ +-- $Id: llx_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index e7fc66a0ed6..a0d88737e3f 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 57b252ed2ea..9e28a37d6bb 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index b8453ea821c..376447586c9 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index 00268974476..e7528a03f28 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 16bf4dea7f0..4f994cf57aa 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index eff6387abee..1a7fdfd755f 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index f53599483a4..a618e3d8790 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index b9643f019c3..902f2b4fd5f 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index db4cdd2581c..1f5500e2eb1 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index 6bf45f749f5..c7d84e27326 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 7db41de673c..523eb3b37e0 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index 8dc4636c87e..bf057b4ad75 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index d500fc1b7cb..ade6a40a80d 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index a515ba541bf..bca670bbb98 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index b742b82dafc..7481589df00 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index fff909a0ec8..4adaa1a56ff 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index fb65e9b7e84..16631c76b76 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 332b1305d38..3df14473a7e 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index ca4206eb6fc..c3958313ea3 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 68e1d4f20e9..910d2ab2072 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 8714e7e4a07..5c7f2e9a59c 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index 7d3b0eecd98..cbaadb10091 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index 8bdd7193d1a..e88665b5a34 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 367d45e8525..86916c216a2 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 28b28aeb762..23065b261c8 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ +-- $Id: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index d78db14c30b..3f58eaf698b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 68e46fd120d..18924ff6ac5 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 6acb2db4585..8056a150fc3 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 838f502bfdb..1b5ea5516d4 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index f21099e9c5e..e61985c7dd1 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index f771be5ef5a..7bf81b7fbe9 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 0033bca36bc..1fb0d708dfa 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 8037c9cd7e5..6df43634ec4 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 99234b6660f..7b6cbd91645 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index dca8e80f856..810781ed6d9 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index f3a58aa1433..2e89f083575 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index 98c56c37567..fd656c736ef 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 100d9fe82b0..87f6416c6c5 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ -- ============================================================================ CREATE LANGUAGE plpgsql; diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index c2d47f668da..4092c55ff2d 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ /** * \file htdocs/lib/admin.lib.php * \brief Library of admin functions - * \version $Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis 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.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $ */ function security_prepare_head() { @@ -615,16 +615,41 @@ function Activate($value,$withdeps=1) // Activate module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } $objMod = new $modName($db); @@ -700,20 +725,46 @@ function UnActivate($value,$requiredby=1) $modName = $value; $ret=''; + $modulesdir=array(); // Desactivation du module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } if ($found) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1bdeb9562e6..49b67f9349a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 1d5b4951490..eedd6a8841c 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -29,7 +29,7 @@ * \ingroup core * \brief File that defines environment for all Dolibarr process (pages or scripts) * This script reads the conf file, init $lang, $db and and empty $user - * \version $Id: master.inc.php,v 1.351 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ */ @@ -70,14 +70,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root[]=$value; + $conf->file->dol_document_root['alt']=$value; } } diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index 454073d9730..d6bf7267439 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index b5304ba4198..6e1e7b262f4 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index bda35165079..b0a7c2dece6 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id$ + * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ */ if (session_id() == "") session_start(); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 8bccf934120..1da2adb751e 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ + * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index efbd289cb3f..a65f888ab11 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ + * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ */ require("../main.inc.php"); @@ -1645,6 +1646,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 8f373b577e8..79601ea1031 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 724900dc500..8cf57ec0b64 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ + * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ */ require("../main.inc.php"); @@ -271,5 +272,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); +llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); ?> diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 1dfd99cc99e..ec5d660daef 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -25,7 +25,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.125 2011/07/31 23:22:57 eldy Exp $ + * \version $Id: soc.php,v 1.126 2011/08/01 00:38:49 eldy Exp $ */ require("../main.inc.php"); @@ -587,7 +587,8 @@ else if ($conf->fournisseur->enabled && (GETPOST("type")=='f' || GETPOST("type")=='')) { $object->fournisseur=1; } if (GETPOST("private")==1) { $object->particulier=1; } - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prenom=$_POST["prenom"]; $object->particulier=$_REQUEST["private"]; $object->prefix_comm=$_POST["prefix_comm"]; @@ -1093,7 +1094,8 @@ else if (! empty($_POST["nom"])) { // We overwrite with values if posted - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prefix_comm=$_POST["prefix_comm"]; $object->client=$_POST["client"]; $object->code_client=$_POST["code_client"]; @@ -1967,5 +1969,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.125 $'); +llxFooter('$Date: 2011/08/01 00:38:49 $ - $Revision: 1.126 $'); ?> \ No newline at end of file diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index f93935ffb16..e78dff8f646 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id$ + * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index e4e52c611b4..9edcafd59c0 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/group/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.39 2011/07/31 23:21:25 eldy Exp $ + * \version $Id: perms.php,v 1.40 2011/08/01 13:15:53 hregis Exp $ */ require("../../main.inc.php"); @@ -93,10 +93,34 @@ if ($_GET["id"]) // Charge les modules soumis a permissions $modules = array(); - foreach ($conf->file->dol_document_root as $dirroot) + $modulesdir = array(); + + foreach ($conf->file->dol_document_root as $type => $dirroot) + { + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } + + foreach ($modulesdir as $dir) { - $dir = $dirroot . "/includes/modules/"; - // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                        "; $handle=@opendir($dir); @@ -292,5 +316,5 @@ if ($_GET["id"]) $db->close(); -llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.39 $'); +llxFooter('$Date: 2011/08/01 13:15:53 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index adb7fa764b6..47710b31d9d 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.56 2011/07/31 23:19:42 eldy Exp $ + * \version $Id: perms.php,v 1.57 2011/08/01 13:15:54 hregis Exp $ */ require("../main.inc.php"); @@ -120,12 +120,34 @@ $db->begin(); // Search all modules with permission and reload permissions def. $modules = array(); +$modulesdir = array(); -$listdir=$conf->file->dol_document_root; -foreach($listdir as $dirroot) +foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir=$dirroot."/includes/modules/"; + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} +foreach($modulesdir as $dir) +{ $handle=opendir($dir); if (is_resource($handle)) { @@ -373,5 +395,5 @@ print '
                        '; $db->close(); -llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.56 $'); +llxFooter('$Date: 2011/08/01 13:15:54 $ - $Revision: 1.57 $'); ?> From 98001f20d7e9d2865f268ae1ad5cc8a7ecba23fc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 22:21:57 +0000 Subject: [PATCH 066/118] Fix: Avoid errors into rpm packages --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/postinst | 100 ++++---- build/deb/postrm | 119 +++++----- build/makepack-dolibarr.pl | 163 ++++++------- 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 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 33 +-- htdocs/admin/perms.php | 32 +-- htdocs/admin/proxy.php | 7 +- htdocs/admin/security_other.php | 7 +- htdocs/admin/system/constall.php | 5 +- htdocs/cashdesk/tpl/menu.tpl.php | 13 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/prelevement/create.php | 7 +- htdocs/core/class/conf.class.php | 9 +- htdocs/langs/es_ES/html/gpl.html | 330 -------------------------- htdocs/langs/nl_BE/html/gpl.txt | 340 --------------------------- htdocs/langs/nl_NL/html/gpl.txt | 339 -------------------------- htdocs/master.inc.php | 9 +- 25 files changed, 311 insertions(+), 1414 deletions(-) delete mode 100644 htdocs/langs/es_ES/html/gpl.html delete mode 100644 htdocs/langs/nl_BE/html/gpl.txt delete mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index d73d7a99219..edb46ffd5a3 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,13 +22,12 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build binary only package +# dpkg -b To build package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# dpkg-reconfigure -plow package Reconfigure package +# # dpkg -L packagename List content of installed package -# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index 3382966714b..b035f18ae1d 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 + -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/postinst b/build/deb/postinst index e0bba1be4da..ca5fd1645dd 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,5 +1,7 @@ #!/bin/sh # postinst script for dolibarr +# +# see: dh_installdeb(1) set -e @@ -14,31 +16,6 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - - -lighttpd_install() { - if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - if which lighty-enable-mod >/dev/null 2>&1 ; then - echo "Add link for Lighttpd config file" - ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf - # We enabled it - lighty-enable-mod dolibarr fastcgi-php - else - echo "Lighttpd not installed, skipping" - fi - fi -} - -apache_install() { - webserver=$1 - if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Add link for Apache config file" - ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - . /usr/share/debconf/confmodule db_version 2.0 @@ -50,6 +27,8 @@ echo Run the dolibarr postinst script # Define vars docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" installconfig="/etc/dolibarr/install.forced.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php" @@ -65,6 +44,10 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir + # Copy apache.conf file into target directory + #mkdir -p /etc/dolibarr + #cp -p $apachefileorig $apacheconfig + # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -91,15 +74,21 @@ case "$1" in chmod -R 660 $config fi - - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - + # Get the web server type (use db_get for interactive mode). + #db_reset "dolibarr/webserver" + #db_get "dolibarr/webserver" # Read value for webserver. + #webserver="$RET" + + case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; + esac + # Set up web server. - for webserver in $webservers ; do - webserver=${webserver%,} - echo Complete config of server $webserver + for server in $webservers ; do + echo Complete config of server $server # Detect webuser and webgroup webuser= @@ -117,31 +106,26 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config + + # Add link to config file + echo Setup web server $server to add dolibarr config file + ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf + done - # Restart web server. - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_install - else - apache_install $webserver - fi - # Reload webserver in any case, configuration might have changed - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $webserver reload 3>/dev/null || true - else - echo Restart web server $server using $server reload - /etc/init.d/$webserver reload 3>/dev/null || true - fi - fi + # Restart servers + servers="apache2-ssl apache2 mysql" + # Another way to restart + for server in $servers ; do + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $server reload || true + else + echo Restart web server $server using $server reload + /etc/init.d/$server reload || true + fi done - echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -152,13 +136,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument $1" >&2 + echo "postinst called with unknown argument \`$1'" >&2 exit 0 ;; esac -#DEBHELPER# - db_stop +#DEBHELPER# + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 27ce3777b7e..9eae81b022b 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,36 +17,7 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - -lighttpd_remove() { - if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - echo "Remove link for Lighttpd config file" - rm -f /etc/lighttpd/conf-available/50-dolibarr.conf - if which lighty-enable-mod >/dev/null 2>&1 ; then - lighty-disable-mod dolibarr - else - echo "Lighttpd not installed, skipping" - fi - # See bug #448682 - if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then - echo 'Manually deleting lighttpd/dolibarr configuration link' - rm /etc/lighttpd/conf-enabled/50-dolibarr.conf - fi - fi -} - -apache_remove() { - if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Remove link for Apache config file" - rm -f /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule -fi +. /usr/share/debconf/confmodule db_version 2.0 @@ -55,62 +26,63 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" +export webserver="" +# Allows us to loop and substitute in one pass +case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; +esac + case "$1" in # Call when we upgrade upgrade) - echo "postrm upgrade" ;; # Call when we uninstall remove) - echo "postrm remove" rm -f $lockfile - # Reconfigure web server - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - - # Restart web servers - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_remove - else - apache_remove $webserver - fi - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $webserver reload 3>/dev/null || true - else - /etc/init.d/$webserver reload 3>/dev/null || true - fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete link $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge" + echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical dolibarr/postrm || true + db_input critical "dolibarr/postrm" || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get dolibarr/postrm + db_get "dolibarr/postrm" set -e if [ "$RET" = "true" ] ; then @@ -213,12 +185,41 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete file $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" + fi + done + rm -rf /etc/dolibarr + # Restart servers + for server in $restart ; do + # We disable blocking errors + set +e + echo "Restart server $server if exists" + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $server reload || true + else + /etc/init.d/$server reload || true + fi + # We restore blocking errors + set -e + done + # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset dolibarr/reconfigure-webserver - db_reset dolibarr/postrm + db_reset "dolibarr/postrm" set -e #db_purge @@ -228,7 +229,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument $1" >&2 + echo "postrm called with unknown argument \`$1'" >&2 exit 0 ;; esac diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index f1527da165b..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.130 2011/08/03 00:47:37 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -306,23 +306,18 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; + #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; + #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; } # Build package for each target @@ -445,61 +440,57 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$FILENAMETGZ2"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; - print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n"; - $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\""; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; $ret=`$cmd`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; # Apache conf files - print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; - $ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`; + #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; # Dolibarr conf files # TODO @@ -524,21 +515,21 @@ if ($nboftargetok) { $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; # Build tgz @@ -575,11 +566,9 @@ if ($nboftargetok) { next; } - + if ($target eq 'DEB') { - $olddir=getcwd(); - $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -614,7 +603,7 @@ if ($nboftargetok) { $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; - open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error"; + open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -668,7 +657,6 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`; @@ -683,22 +671,19 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache and lighttpd conf files + # Apache conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; + + # Dolibarr conf files + # TODO # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -744,15 +729,17 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - # Creation of binary package (to build without sources) - #print "Go to directory $BUILDROOT\n"; - #chdir("$BUILDROOT"); + print "Go to directory $BUILDROOT\n"; + $olddir=getcwd(); + chdir("$BUILDROOT"); + + # Creation of binary package (to build without sources) #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Prepare source package + # Creation of source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -764,7 +751,6 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; - $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -780,9 +766,6 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; - - # Creation of source package - print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; 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/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/proxy.php b/htdocs/admin/proxy.php index f02e3d6203a..2c284c5cae8 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ */ require("../main.inc.php"); @@ -206,5 +205,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); +llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c0aaaa86213..c1d629f7b7b 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ */ require("../main.inc.php"); @@ -348,5 +347,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); +llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); ?> diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index a07b28bd2cf..f478b65e3a8 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.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/constall.php * \brief Page to show all Dolibarr setup (config file and database constants) - * \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $ + * \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $ */ require("../../main.inc.php"); 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/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 5ba2ef8997e..0c262ba2936 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ */ require("./pre.inc.php"); @@ -386,5 +385,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); +llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 9ee1f551048..525160df9ef 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ */ require("./pre.inc.php"); @@ -608,5 +607,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); +llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); ?> diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 689e2639773..79d00ae00c7 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ + * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -276,5 +275,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); +llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); ?> 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/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html deleted file mode 100644 index 38e0f007a15..00000000000 --- a/htdocs/langs/es_ES/html/gpl.html +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - -H. Licencia Pública GNU - - - - - - - - - - - - - -

                          Licencia Pública GNU

                          - - - - -
                          - -GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 - -
                          - -

                          Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, - MA 02139, USA.

                          -

                          Está permitido, a cualquier persona, copiar y distribuir copias tal cual de - este documento de licencia, sin la introducción de cualquier cambio. -

                          - -
                          -

                          Introducción

                          -

                          Las licencias de muchos softwares se desarrollan para asegurar la libertad - de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, - al contrario, pretende garantizar la libertad de compartir y alterar softwares - de libre distribución - volviéndolos de libre distribución también para cualquier - de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares - de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla - (algunos softwares de la FSF son cubiertos por la GNU Library General Public - License).

                          -

                          Cuando nos referimos a softwares de libre distribución, nos referimos a la - libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar - la libertad de distribución de copias de softwares de libre distribución (y - cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos - fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se - hacen algunas restricciones, para asegurar los derechos de los programadores, - prohibiendo a todas las personas su negación o la solicitación de su abdicación. - Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución - o modificación del software.

                          -

                          Por ejemplo, al distribuirse copias de determinado programa, por una tasa - determinada o gratuitamente, se debe informar sobre todos los derechos incidentes - sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia - Pública General GNU.

                          -

                          La protección de los derechos envuelve dos pasos: (1) copyright del software - y (2) licencia que da permiso legal para copia, distribución y/o modificación - del softwares.

                          -

                          Aún para la protección de la FSF y del autor es importante que todos entiendan - que no hay garantías para softwares de libre distribución. Si software se modifica - por alguien y lo pasa adelante, este software no más reflejará el trabajo original - del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                          -

                          Finalmente, cualquier programa de libre distribución está constantemente amenazado - por las patentes de softwares. Buscamos evitar el peligro de que distribuidores - de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. - Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación - de patente se debe hacer permitiendo el uso por cualquier individuo, sin la - necesidad de licencia de uso.

                          -

                          Los términos y condiciones precisas para copia, distribución y modificación - siguen abajo:

                          -
                          -

                          Licencia Pública General GNU

                          -

                          TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN -

                          - -
                            - -

                          1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga - un aviso colocado por el detentor de los derechos de autor diciendo que aquel - podrá ser distribuido en las condiciones de la Licencia Pública General. El - Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado - en un Programa y significa tanto el propio Programa, como cualquier de los - trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, - un trabajo que contenga el Programa o una parte de este, en su forma original - o con modificaciones o traducido para una otra lengua (la traducción está - incluida sin limitaciones en el término ``modificación'').

                            -

                            Actividades distintas de copia, distribución y modificación no están cubiertas - por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa - no está restringido y la salida del Programa está cubierta solamente en - el caso de que su contenido contenga trabajos basados en el Programa (independientemente - de que hayan sido creados por la ejecución del Programa). Si esto es así, - depende de las funciones ejecutadas por el Programa.

                            2. - -

                          2. El código fuente del Programa, de la forma como fue recibido, puede ser - copiado y distribuido, en cualquier media, desde que sea providenciado un - aviso adecuado sobre los copyrights y la negación de garantías, y todos los - avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, - estén inalterados y que cualquier producto oriundo del Programa esté acompañado - de esta Licencia Pública General.

                            -

                            Está permitido el cobro de tasas por el acto físico de transferencia o - grabación de copias, y pueden ser dadas garantías y soporte en cambio del - cobro de valores.

                            3. - - -
                          3. -

                            Se puede modificar la copia o copias del Programa de cualquier forma que - se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir - tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                            - -
                              -

                            1. Debe existir un aviso destacado de que los datos originales fueron alterados - en los archivos y las fechas de los cambios;

                              2. - -

                            2. Debe existir un aviso de que el trabajo distribuido o publicado es, - de forma total o parcial, derivado del Programa o de alguna parte suya, - y que puede ser licenciado totalmente sin costes para terceros bajo los - términos de esta Licencia.

                              3. - -

                            3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, - en el inicio de tu ejecución, presentar la información de copyright y - de ausencia de garantías (o de que la garantía es de responsabilidad de - terceros), y que los usuarios pueden redistribuir el programa bajo estas - condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                              4. -
                            - - Estos requisitos se aplican a trabajos de modificación en general. Si - algunas secciones identificables no sean derivadas del Programa, y pueden - ser consideradas como partes independientes, entonces esta Licencia y sus - Términos no se aplican a aquellas secciones cuando distribuidas separadamente. - Pero al distribuir aquellas secciones como parte de un trabajo basado en - el Programa, la distribución, como un todo, debe contener los términos de - esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no - a cada una de las partes independientemente de quem los tenga desarrollado. - Más que tener intención de contestar los derechos sobre el trabajo desarrollado - por alguien, esta sección objetiva propiciar la correcta distribución de - trabajos derivados del Programa. - Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado - en él ni a un trabajo basado en él, a un volumen de almacenaje o media de - distribución no obliga la utilización de esta Licencia y de sus términos - al trabajo. -
                            4. - - -
                          4. -

                            Están permitidas, la copia y la distribución, del Programa (o un trabajo - basado en éste) en la forma de código objeto o ejecutable de acuerdo con los - términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                            - -
                              -

                            1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos - en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada - para manejo de softwares o

                              -
                              2. -

                            2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, - de poner a disposición a terceros, por un coste no superior al coste del - medio físico de almacenaje, una copia completa de los códigos fuente en - medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                              -
                              3. -

                            3. Esté acompañada con la misma información recibida en relación con la - oferta de la distribución del código fuente correspondiente (esta alternativa - solamente está permitida para distribuciones no comerciales y solamente - si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, - de acuerdo con la sección 2 arriba).

                              -
                              4. -
                            - El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones - en aquel trabajo. Cuando se habla en códigos fuentes completos significa - hablar de todos los fuentes de todos los módulos, además de las definiciones - de interfaces asociadas, archivos, scripts utilizados en la compilación - y instalación del ejecutable. Como una excepción excepcional, el código - fuente distribuido podrá no incluir algunos componentes que no se encuentren - en su escopo, como compilador, kernel, etc... para el SO donde el trabajo - sea ejecutado. - Si la distribución del ejecutable o objeto se hace, a través de acceso - a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente - de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos - con los objetos simultáneamente -
                            5. - -
                          5. -

                            No está permitida la copia, modificación, sublicenciamiento o distribución - del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier - tentativa de copia, modificación, sublicenciamiento o distribución del Programa - está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. - Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, - no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas - de esta Licencia.

                            6. -
                          6. -

                            No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá - documento o contrato que garantice permiso de modificación o distribución - del Programa o sus trabajos derivados. Estas acciones están prohibidas por - ley, en el caso de que no se acepten las condiciones de esta Licencia. La - modificación o distribución del Programa, o cualquier trabajo basado en éste, - implica en la aceptación de esta Licencia y de todos los términos de ésta - para copia, distribución o modificación del Programa o trabajos basados en - éste.

                            7. -
                          7. -

                            Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), - el recipiente automáticamente recibe una licencia del detentor original de - los derechos de copia, distribución o modificación del Programa objeto de - estos términos y condiciones. No pueden ser impuestas otras restricciones - en los recipientes.

                            8. - -
                          8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes - o derechos de autor, se impongan restricciones, que contradigan esta Licencia, - estos no exentan de su aplicación. Si no es posible distribuir el Programa - de forma a garantizar simultáneamente las obligaciones de esta Licencia y - otras que sean necesarias, entonces el Programa no podrá ser distribuido. -

                            Si esta Sección se considera, inválida por cualquier motivo particular - o general, su resultado implicará en la invalidación general de esta licencia - en la copia, modificación, sublicenciamiento o distribución del Programa - o trabajos basados en éste.

                            -

                            El propósito de esta sección no es, de forma alguna, incitar a quien quiera - que sea a infringir derechos reclamados en cuestiones válidas y procedentes, - y si proteger las premisas del sistema de libre distribución de software. - Muchas personas tienen hecho contribuciones generosas al sistema, en la - forma de programas, y es necesario garantizar la consistencia y credibilidad - del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución - de los softwares.

                            -

                            Esta sección pretende hacer claro los motivos que crearan las demás cláusulas - de estas Licencia.

                            9. - -
                          9. -

                            Si la distribución del Programa, dentro de los términos de esta Licencia, - tiene restricciones en algún País, por patentes o derechos de autor, el detentor - original de los derechos de autor del Programa bajo esta Licencia puede adicionar - explícitamente limitaciones geográficas de distribución, excluyendo aquellos - Países, haciendo con que la distribución solamente sea posible en los Países - no excluidos.

                            10. - -
                          10. -

                            La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) - puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública - General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos - objetivos y el espirito de la presente versión, pudiendo variar en detalles - referentes a nuevas situaciones encontradas.

                            -

                            A cada versión se da un número distinto. Si el Programa especifica, un - número de versión determinado de esta Licencia, que tenga en su contenido - la expresión ``o versión más actualizada'', es posible optar por las condiciones - de aquella versión o de cualquier versión más actualizada publicada por - la FSF.

                            11. - -
                          11. -

                            Si deseas incorporar parte del Programa en otros programas de libre distribución - de softwares hace falta autorización formal del autor. Para softwares que - la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde - que mantenido el espirito y objetivos originales de esta Licencia.

                            12. -
                          - -

                          AUSENCIA DE GARANTÍAS

                          -
                            -

                          1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER - GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE - EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS - DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, - LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD - Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS - CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y - REPAROS JUZGADOS NECESARIOS.

                            2. -

                          2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR - LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN - RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE - HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS - O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES - O DAÑOS.

                            -

                            FIN DE LA LICENCIA

                          - - -
                          -

                           

                          -

                          Apéndice

                          -

                          ¿Cómo aplicar estos términos a nuevos softwares?

                          -

                          Si has desarrollado un nuevo programa y deseas su amplia distribución para - el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, - que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                          -

                          Para esto basta con anexar este aviso al programa. Se recomienda indicar aún - en el inicio de cada archivo fuente la ausencia de garantías y una anotación - de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                          -

                          <nombre del programa y función> Copyright (C) 199X <Autor> -

                          -

                          Este programa es un software de libre distribución, que puede ser copiado - y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo - con la publicada por la Free Software Foundation, versión 2 de la licencia o - (a criterio del autor) cualquier versión posterior.

                          -

                          Este programa se distribuye en la expectativa de ser útil a sus usuarios, - pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE - ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General - 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. -

                          -

                          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:

                          -

                          Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares - NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software - de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. - Teclea 'muestra condic' para mayores detalles.

                          -

                          Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las - partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos - pueden variar o pueden ser accionados por otras interfaces como clic de ratón, - etc...

                          -

                           

                          -
                          -
                          - -www.conectiva.com - -
                          - - - - - diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt deleted file mode 100644 index 3efbe1ccee7..00000000000 --- a/htdocs/langs/nl_BE/html/gpl.txt +++ /dev/null @@ -1,340 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -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 deleted file mode 100644 index 778e2b02b41..00000000000 --- a/htdocs/langs/nl_NL/html/gpl.txt +++ /dev/null @@ -1,339 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van -deze licentie. \ No newline at end of file diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index eedd6a8841c..03ef2767e40 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -21,7 +21,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -29,7 +30,7 @@ * \ingroup core * \brief File that defines environment for all Dolibarr process (pages or scripts) * This script reads the conf file, init $lang, $db and and empty $user - * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ + * \version $Id: master.inc.php,v 1.350 2011/07/30 10:23:24 eldy Exp $ */ @@ -70,14 +71,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root['alt']=$value; + $conf->file->dol_document_root[]=$value; } } From dd70cb9656547174b34f318371b25bfacf95948a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 23:45:11 +0000 Subject: [PATCH 067/118] Fix: Avoid errors into rpm packages --- htdocs/contrat/fiche.php | 6 +++--- htdocs/core/class/conf.class.php | 5 ++--- htdocs/core/class/cookie.class.php | 5 ++--- htdocs/core/class/translate.class.php | 7 +++---- htdocs/imports/import.php | 7 +++---- 5 files changed, 13 insertions(+), 17 deletions(-) diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index b0145e14628..0cf91d64abc 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -23,7 +23,7 @@ * \file htdocs/contrat/fiche.php * \ingroup contrat * \brief Page of a contract - * \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $ + * \version $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $ */ require ("../main.inc.php"); @@ -757,7 +757,7 @@ else $var=!$var; - if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid) + if ($action != 'editline' || $_GET["rowid"] != $objp->rowid) { print ''; // Libelle @@ -1286,5 +1286,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $'); +llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index e6559c2ae2e..acb0b5d9167 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -16,8 +16,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -25,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $ + * \version $Id: conf.class.php,v 1.63 2011/07/31 23:45:13 eldy Exp $ */ diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php index 07fed567b48..c21450bb8cb 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ + * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 4496c18ff1f..bf30794f153 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -23,7 +23,7 @@ * \brief File for Tanslate class * \author Eric Seigne * \author Laurent Destailleur - * \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $ + * \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $ */ @@ -512,10 +512,9 @@ class Translate { * Return list of all available languages * @param langdir Directory to scan * @param maxlength Max length for each value in combo box (will be truncated) - * @param usecode Show code instead of country name for language variant * @return array List of languages */ - function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0) + function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0) { global $conf; @@ -528,7 +527,7 @@ class Translate { { $this->load("languages"); - if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE)) + if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE) { $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength); } diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index c03b55d2347..97d4d8252d3 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ + * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ */ require_once("../main.inc.php"); @@ -1669,7 +1668,7 @@ print '
                          '; $db->close(); -llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); +llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); /* From b847c4a69a44f7e1807b4fa544dd830ac9239a36 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Aug 2011 18:22:25 +0000 Subject: [PATCH 068/118] Work on debian package --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/config | 45 ++-- build/deb/postinst | 108 ++++---- build/deb/postrm | 117 +++++---- build/makepack-dolibarr.pl | 36 ++- 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 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 35 ++- htdocs/admin/perms.php | 34 ++- htdocs/admin/proxy.php | 7 +- htdocs/admin/security_other.php | 7 +- htdocs/admin/system/constall.php | 5 +- htdocs/cashdesk/tpl/menu.tpl.php | 13 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/prelevement/create.php | 7 +- htdocs/contrat/fiche.php | 6 +- htdocs/core/class/conf.class.php | 6 +- htdocs/core/class/cookie.class.php | 5 +- htdocs/core/class/translate.class.php | 7 +- htdocs/imports/import.php | 7 +- htdocs/langs/es_ES/html/gpl.html | 330 +++++++++++++++++++++++++ htdocs/langs/nl_BE/html/gpl.txt | 340 ++++++++++++++++++++++++++ htdocs/langs/nl_NL/html/gpl.txt | 339 +++++++++++++++++++++++++ htdocs/master.inc.php | 9 +- 30 files changed, 1388 insertions(+), 287 deletions(-) create mode 100644 htdocs/langs/es_ES/html/gpl.html create mode 100644 htdocs/langs/nl_BE/html/gpl.txt create mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index edb46ffd5a3..d73d7a99219 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build package +# dpkg -b To build binary only package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# +# dpkg-reconfigure -plow package Reconfigure package # dpkg -L packagename List content of installed package +# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index b035f18ae1d..3382966714b 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 + -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/config b/build/deb/config index 553e5ffd7f6..fd5ea96491b 100644 --- a/build/deb/config +++ b/build/deb/config @@ -13,29 +13,25 @@ db_version 2.0 echo Run the dolibarr config script # Rotate old configuration -#if [ "$1" = "reconfigure" ] ; then -# config="/etc/dolibarr/apache.conf" -# if [ -f $config ] ; then -# for i in $(seq 8 -1 0) ; do -# if [ -f ${config}.$i ] ; then -# mv ${config}.$i ${config}.$(($i +1)) -# fi -# done -# mv ${config} ${config}.0 -# fi -#fi +if [ "$1" = "reconfigure" ] ; then + config="/etc/dolibarr/apache.conf" + for i in $(seq 8 -1 0) ; do + if [ -f ${config}.$i ] ; then + mv ${config}.$i ${config}.$(($i +1)) + fi + done + mv ${config} ${config}.0 +fi # Rotate old configuration -#if [ "$1" = "reconfigure" ] ; then -# config="/etc/dolibarr/lighttpd.conf" -# if [ -f $config ] ; then -# for i in $(seq 8 -1 0) ; do -# if [ -f ${config}.$i ] ; then -# mv ${config}.$i ${config}.$(($i +1)) -# fi -# done -# mv ${config} ${config}.0 -# fi -#fi +if [ "$1" = "reconfigure" ] ; then + config="/etc/dolibarr/lighttpd.conf" + for i in $(seq 8 -1 0) ; do + if [ -f ${config}.$i ] ; then + mv ${config}.$i ${config}.$(($i +1)) + fi + done + mv ${config} ${config}.0 +fi db_capb backup @@ -43,9 +39,8 @@ db_capb backup db_title "dolibarr" || true -# Ask if we must delete database -echo "Ask for web server to setup" -db_input critical dolibarr/reconfigure-webserver || true +# Ask for web server type. +#db_input critical "dolibarr/webserver" || true if db_go ; then okcancel="1" diff --git a/build/deb/postinst b/build/deb/postinst index ca5fd1645dd..9f103d8876d 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,7 +1,5 @@ #!/bin/sh # postinst script for dolibarr -# -# see: dh_installdeb(1) set -e @@ -16,6 +14,31 @@ set -e # for details, see /usr/share/doc/packaging-manual/ + + +lighttpd_install() { + if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + if which lighty-enable-mod >/dev/null 2>&1 ; then + echo "Add link for Lighttpd config file" + ln -s /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf + # We enabled it + lighty-enable-mod dolibarr fastcgi-php + else + echo "Lighttpd not installed, skipping" + fi + fi +} + +apache_install() { + webserver=$1 + if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Add link for Apache config file" + ln -s /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + . /usr/share/debconf/confmodule db_version 2.0 @@ -27,8 +50,6 @@ 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" @@ -44,10 +65,6 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir - # Copy apache.conf file into target directory - #mkdir -p /etc/dolibarr - #cp -p $apachefileorig $apacheconfig - # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -74,21 +91,23 @@ case "$1" in chmod -R 660 $config fi - # Get the web server type (use db_get for interactive mode). - #db_reset "dolibarr/webserver" - #db_get "dolibarr/webserver" # Read value for webserver. - #webserver="$RET" - - case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; - esac - + + # Reconfigure web server + db_reset dolibarr/reconfigure-webserver + + # Ask if we must delete database + echo "Ask for web server to setup" + db_input critical dolibarr/reconfigure-webserver || true + db_go || true + + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + # Set up web server. - for server in $webservers ; do - echo Complete config of server $server + for webserver in $webservers ; do + webserver=${webserver%,} + echo Complete config of server $webserver # Detect webuser and webgroup webuser= @@ -106,26 +125,31 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config - - # Add link to config file - echo Setup web server $server to add dolibarr config file - ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf - done - # Restart servers - servers="apache2-ssl apache2 mysql" - # Another way to restart - for server in $servers ; do - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $server reload || true - else - echo Restart web server $server using $server reload - /etc/init.d/$server reload || true - fi + # Restart web server. + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_install + else + apache_install $webserver + fi + # Reload webserver in any case, configuration might have changed + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $webserver reload 3>/dev/null || true + else + echo Restart web server $server using $server reload + /etc/init.d/$webserver reload 3>/dev/null || true + fi + fi done + echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -136,13 +160,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument $1" >&2 exit 0 ;; esac -db_stop - #DEBHELPER# +db_stop + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 9eae81b022b..dd05ee90379 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,7 +17,36 @@ set -e # for details, see /usr/share/doc/packaging-manual/ -. /usr/share/debconf/confmodule + +lighttpd_remove() { + if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + echo "Remove link for Lighttpd config file" + rm -f /etc/lighttpd/conf-available/50-dolibarr.conf + if which lighty-enable-mod >/dev/null 2>&1 ; then + lighty-disable-mod dolibarr + else + echo "Lighttpd not installed, skipping" + fi + # See bug #448682 + if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then + echo 'Manually deleting lighttpd/dolibarr configuration link' + rm /etc/lighttpd/conf-enabled/50-dolibarr.conf + fi + fi +} + +apache_remove() { + if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Remove link for Apache config file" + rm -f /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi db_version 2.0 @@ -26,22 +55,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="" -# Allows us to loop and substitute in one pass -case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; -esac - case "$1" in @@ -53,36 +71,44 @@ case "$1" in 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" + # Reconfigure web server + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + + # Restart web servers + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_remove + else + apache_remove $webserver + fi + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload 3>/dev/null || true + else + /etc/init.d/$webserver reload 3>/dev/null || true + fi fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" + echo "postrm purge webservers=$webservers" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical "dolibarr/postrm" || true + db_input critical dolibarr/postrm || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get "dolibarr/postrm" + db_get dolibarr/postrm set -e if [ "$RET" = "true" ] ; then @@ -185,41 +211,12 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi - # Remove include files - export restart="" - for server in $webservers ; do - export conffile="/etc/$server/conf.d/dolibarr.conf" - if [ -f $conffile ] ; - then - echo Delete file $conffile - rm -f $conffile - status=purge - fi - - if [ "x$status" = "xpurge" ] ; - then restart="$restart $server" - fi - done - rm -rf /etc/dolibarr - # Restart servers - for server in $restart ; do - # We disable blocking errors - set +e - echo "Restart server $server if exists" - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $server reload || true - else - /etc/init.d/$server reload || true - fi - # We restore blocking errors - set -e - done - # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset "dolibarr/postrm" + db_reset dolibarr/reconfigure-webserver + db_reset dolibarr/postrm set -e #db_purge @@ -229,7 +226,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "postrm called with unknown argument $1" >&2 exit 0 ;; esac diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index d3c47e6b28d..20c5ba415e9 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.129 2011/08/01 18:22:26 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -318,6 +318,9 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; } # Build package for each target @@ -569,6 +572,8 @@ if ($nboftargetok) { if ($target eq 'DEB') { + $olddir=getcwd(); + $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -671,19 +676,22 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache conf files + # Apache and lighttpd conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - - # Dolibarr conf files - # TODO + print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -729,17 +737,15 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - print "Go to directory $BUILDROOT\n"; - $olddir=getcwd(); - chdir("$BUILDROOT"); - - # Creation of binary package (to build without sources) + # Creation of binary package (to build without sources) + #print "Go to directory $BUILDROOT\n"; + #chdir("$BUILDROOT"); #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Creation of source package + # Prepare source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -751,6 +757,7 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; + $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -766,6 +773,9 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; + + # Creation of source package + print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/build/rpm/README b/build/rpm/README index 99a1bb3552c..f20bf91db72 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -5,17 +5,24 @@ RPM Package tools This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, -with format RPM (for Redhat, Mandriva, ...). +with format RPM (for Redhat, OpenSuse, Mandriva, ...). -# This is standard command to work on Debian packaging: +# This is standard command to work on RPM packaging: +# +# yum -y install rpmlint +# yum -y install hunspell-en hunspell-es hunspell-fr hunspell-it # # rpmlint file.rpm Test a package +# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm # # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies -# yum erase dolibarr To remove package +# yum erase dolibarr To remove package +# chcon -R -h -t httpd_sys_script_rw_t /file To add temporary context rw for httpd on /file +# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" To add persistent context rw for httpd on /dir (this add file_contexts.local) +# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage) # # On OpenSuse # yast --install dolibarr-...rpm To install package and dependencies diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index 4b4fb60dadb..337b92d8049 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -4,13 +4,14 @@ Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti -Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 708546cf263..08fe933d774 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -5,6 +5,11 @@ # file to build a package for your own distributions and # edit it if you need to match your rules. # -------------------------------------------------------- + +#%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0) +#%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) +#%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0) + %define name dolibarr %define version __VERSION__ %define release __RELEASE__ @@ -12,9 +17,12 @@ Name: %{name} Version: %{version} Release: %{release} -Summary: Dolibarr +Summary: ERP and CRM software for small and medium companies or foundations +Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos +Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations +Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti -License: GPL +License: GPLv2+ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team @@ -56,13 +64,12 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Un software ERP y CRM open source/gratis para pequeñas y -medianas empresas, asociaciones o autónomos. Incluye diferentes -funcionalidades para la Planificación de Recursos Empresariales (ERP) y -Gestión de la Relación con los Clientes (CRM) así como para para otras -diferentes actividades. Dolibarr ha sido diseñado para suministrarle -solamente las funcionalidades que necesita y haciendo hincapié en su -facilidad de uso. +Un software ERP y CRM para pequeñas y medianas empresas, asociaciones +o autónomos. Incluye diferentes funcionalidades para la Planificación +de Recursos Empresariales (ERP) y Gestión de la Relación con los +Clientes (CRM) así como para para otras diferentes actividades. +Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades +que necesita y haciendo hincapié en su facilidad de uso. %description -l fr Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, @@ -71,12 +78,12 @@ fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Un programma gestionale open source e gratuito per piccole e medie +Un programmo gestionale per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori -attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno +attività. Progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. -Dolibar è completamente web-based, progettato per poter fornire solo ciò di +Programmo web, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. @@ -94,49 +101,51 @@ echo Building %{name}-%{version}-%{release} #---- install %install -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr +%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf +%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr # %{_datadir} = /usr/share -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +%{__install} -m 644 var/www/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications +%{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README -install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/doc $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/htdocs $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT #---- clean %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT #---- files %files + %defattr(-,root,root) -%doc README -%doc COPYRIGHT %doc /var/www/dolibarr/doc/* %dir /var/www/dolibarr/build %dir /var/www/dolibarr/htdocs %dir /var/www/dolibarr/scripts -%_datadir/pixmaps/* +%_datadir/pixmaps/dolibarr.png %_datadir/applications/%{name}.desktop /var/www/dolibarr/build/* /var/www/dolibarr/htdocs/* /var/www/dolibarr/scripts/* -/var/www/dolibarr/README -/var/www/dolibarr/COPYRIGHT -#%config /var/www/dolibarr/htdocs/conf/conf.php + +%defattr(0664, -, -, 0755) +%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf +%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr #---- post (after unzip during install) @@ -154,11 +163,11 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr" +export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="/usr/share/dolibarr/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="/usr/share/dolibarr/install.lock" # Detect OS @@ -192,8 +201,8 @@ echo OS detected: $os # Create empty directory for uploaded files and generated documents echo Create document directory $docdir -mkdir -p $docdir -mkdir -p %{_sysconfdir}/dolibarr +%{__mkdir} -p $docdir +%{__mkdir} -p %{_sysconfdir}/dolibarr # Create install.forced.php into Dolibarr install directory superuserlogin='' @@ -205,12 +214,12 @@ if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then fi echo Mysql superuser found to use is $superuserlogin if [ -z "$superuserlogin" ] ; then - cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig + %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig else - cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig + %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig fi -chown -R root:$apachegroup $installconfig -chmod -R 660 $installconfig +%{__chown} -R root:$apachegroup $installconfig +%{__chmod} -R 660 $installconfig # Create an empty conf.php with permission to web server if [ ! -f $config ] @@ -222,19 +231,20 @@ then fi # Create config file for apache $apacheconfig -if [ ! -f $apacheconfig ]; then - echo Create dolibarr web server config file $apacheconfig - cp $apachefileorig $apacheconfig - chmod a-x $apacheconfig - chmod go-w $apacheconfig -fi - -# Create config file for se $seconfig -if [ ! -f $seconfig ]; then - echo Create se config file $seconfig - cp $sefileorig $seconfig +#if [ ! -f $apacheconfig ]; then +# echo Create dolibarr web server config file $apacheconfig +# cp $apachefileorig $apacheconfig # chmod a-x $apacheconfig # chmod go-w $apacheconfig +#fi + +# Create config file for se $seconfig +if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then + echo Add SE Linux permission from file $sefileorig +# cp $sefileorig $seconfig + restorecon -R -v /etc/dolibarr + restorecon -R -v /var/www/dolibarr + restorecon -R -v /usr/share/dolibarr fi # Create a config link dolibarr.conf @@ -253,18 +263,6 @@ echo Set permission to $apacheuser:$apachegroup on $docdir chown -R $apacheuser:$apachegroup $docdir chmod -R o-w $docdir -# Set SE Linux on OS SE is enabled -if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then - echo Set SELinux permissions - # Warning: chcon seems not cumulative - #chcon -R -h -t httpd_sys_content_t $targetdir - #chcon -R -h -t httpd_sys_content_t $docdir - chcon -R -h -t httpd_sys_script_rw_t $targetdir - chcon -R -h -t httpd_sys_script_rw_t $docdir - chcon -R -h -t httpd_sys_script_rw_t %{_sysconfdir}/dolibarr - #chcon -R -h -t httpd_sys_script_exec_t $targetdir -fi - # Restart web server echo Restart web server if [ -f %{_sysconfdir}/init.d/httpd ]; then @@ -274,6 +272,12 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then %{_sysconfdir}/init.d/apache2 restart fi +# Restart mysql +echo Restart mysql +if [ -f /etc/init.d/mysqld ]; then + /etc/init.d/mysqld restart +fi + # Show result echo echo "----- Dolibarr %version - (c) Dolibarr dev team -----" @@ -301,9 +305,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="$targetdir/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="$targetdir/install.lock" # Detect OS @@ -338,7 +342,7 @@ echo OS detected: $os if [ -f $apachelink ] ; then echo Delete apache config link for Dolibarr - rm -f $apachelink + %{__rm} -f $apachelink status=purge fi @@ -356,18 +360,15 @@ then fi # Removed dirs after apache restart -echo Removed remaining $apacheconfig -rm -f $apacheconfig echo Removed remaining $config -rm -f $config +%{__rm} -f $config echo Removed remaining $installconfig -rm -f $installconfig +%{__rm} -f $installconfig echo Removed remaining $lockfile -rm -f $lockfile +%{__rm} -f $lockfile echo Removed remaining dir $targetdir/doc rmdir $targetdir/doc >/dev/null 2>&1 -#echo Removed remaining dir $targetdir/htdocs -#rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm + %changelog * Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 diff --git a/build/rpm/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr index 64376e5afb6..193a43b7dbe 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -1,3 +1,3 @@ -/etc/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/var/www/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file +/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/var/www/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 3cc548e1c0a..d7172d651f0 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -27,7 +27,7 @@ * \file htdocs/includes/modules/modMyModule.class.php * \ingroup mymodule * \brief Description and activation file for module MyModule - * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $ + * \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); @@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='generic'; - // Defined if the directory /mymodule/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 718c842d046..34e7f48cea8 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -20,7 +20,7 @@ /** * \file htdocs/admin/boxes.php * \brief Page to setup boxes - * \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $ */ require("../main.inc.php"); @@ -278,7 +278,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -394,7 +394,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -470,5 +470,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $'); +llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $'); ?> diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index a907f47663a..671bd69a0e4 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2010 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ /** * \file htdocs/admin/modules.php * \brief Page to activate/disable all modules - * \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $ */ require("../main.inc.php"); @@ -79,12 +79,35 @@ $modules = array(); $orders = array(); $categ = array(); $dirmod = array(); +$modulesdir = array(); $i = 0; // is a sequencer of modules found $j = 0; // j is module number. Automatically affected if module number not defined. -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $althandle=@opendir($dirroot); + if (is_resource($althandle)) + { + while (($file = readdir($althandle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                          "; dol_syslog("Scan directory ".$dir." for modules"); @@ -449,5 +472,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $'); +llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $'); ?> diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index bee00b52906..6af9b54e7f0 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -21,7 +21,7 @@ * \file htdocs/admin/perms.php * \ingroup core * \brief Page d'administration/configuration des permissions par defaut - * \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $ + * \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $ */ require("../main.inc.php"); @@ -76,10 +76,34 @@ $db->begin(); // Charge les modules soumis a permissions $modules = array(); -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +$modulesdir = array(); +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                          "; $handle=@opendir($dir); @@ -194,5 +218,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $'); +llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $'); ?> diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 2c284c5cae8..f02e3d6203a 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ + * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -205,5 +206,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c1d629f7b7b..c0aaaa86213 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -347,5 +348,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index f478b65e3a8..a07b28bd2cf 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/system/constall.php * \brief Page to show all Dolibarr setup (config file and database constants) - * \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $ + * \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $ */ require("../../main.inc.php"); diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 83dac68a99e..8b82c9f8249 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); @@ -63,11 +62,13 @@ $logout=''; print '
                            '; +// Link to new sell print '
                          • '.$langs->trans("NewSell").'
                            • '; - -print '
                          • '.$langs->trans("BackOffice").'
                            • '; - -print '
                          • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' '.$logout.'
                            '; +// Open new tab on backoffice (this is not a disconnect from POS) +print '
                          • '.$langs->trans("BackOffice").'
                            • '; +// Disconnect +print '
                          • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom']; +print ' '.$logout.'
                            '; print $langs->trans("CashDeskThirdParty").': '.$companyLink.'
                            '; /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'
                            '; print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'
                            '; diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 0c262ba2936..5ba2ef8997e 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -385,5 +386,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 525160df9ef..9ee1f551048 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ + * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -607,5 +608,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 79d00ae00c7..689e2639773 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ + * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -275,5 +276,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); +llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 0cf91d64abc..b0145e14628 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -23,7 +23,7 @@ * \file htdocs/contrat/fiche.php * \ingroup contrat * \brief Page of a contract - * \version $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $ + * \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $ */ require ("../main.inc.php"); @@ -757,7 +757,7 @@ else $var=!$var; - if ($action != 'editline' || $_GET["rowid"] != $objp->rowid) + if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid) { print ''; // Libelle @@ -1286,5 +1286,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $'); +llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index acb0b5d9167..c5664164e74 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -24,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.63 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ */ @@ -144,13 +144,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard + $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard + $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/'; } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php index c21450bb8cb..07fed567b48 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,13 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index bf30794f153..4496c18ff1f 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -23,7 +23,7 @@ * \brief File for Tanslate class * \author Eric Seigne * \author Laurent Destailleur - * \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $ + * \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $ */ @@ -512,9 +512,10 @@ class Translate { * Return list of all available languages * @param langdir Directory to scan * @param maxlength Max length for each value in combo box (will be truncated) + * @param usecode Show code instead of country name for language variant * @return array List of languages */ - function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0) + function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0) { global $conf; @@ -527,7 +528,7 @@ class Translate { { $this->load("languages"); - if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE) + if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE)) { $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength); } diff --git a/htdocs/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/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html new file mode 100644 index 00000000000..38e0f007a15 --- /dev/null +++ b/htdocs/langs/es_ES/html/gpl.html @@ -0,0 +1,330 @@ + + + + + + + + +H. Licencia Pública GNU + + + + + + + + + + + + + +

                            Licencia Pública GNU

                            + + + + +
                            + +GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 + +
                            + +

                            Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, + MA 02139, USA.

                            +

                            Está permitido, a cualquier persona, copiar y distribuir copias tal cual de + este documento de licencia, sin la introducción de cualquier cambio. +

                            + +
                            +

                            Introducción

                            +

                            Las licencias de muchos softwares se desarrollan para asegurar la libertad + de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, + al contrario, pretende garantizar la libertad de compartir y alterar softwares + de libre distribución - volviéndolos de libre distribución también para cualquier + de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares + de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla + (algunos softwares de la FSF son cubiertos por la GNU Library General Public + License).

                            +

                            Cuando nos referimos a softwares de libre distribución, nos referimos a la + libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar + la libertad de distribución de copias de softwares de libre distribución (y + cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos + fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se + hacen algunas restricciones, para asegurar los derechos de los programadores, + prohibiendo a todas las personas su negación o la solicitación de su abdicación. + Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución + o modificación del software.

                            +

                            Por ejemplo, al distribuirse copias de determinado programa, por una tasa + determinada o gratuitamente, se debe informar sobre todos los derechos incidentes + sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia + Pública General GNU.

                            +

                            La protección de los derechos envuelve dos pasos: (1) copyright del software + y (2) licencia que da permiso legal para copia, distribución y/o modificación + del softwares.

                            +

                            Aún para la protección de la FSF y del autor es importante que todos entiendan + que no hay garantías para softwares de libre distribución. Si software se modifica + por alguien y lo pasa adelante, este software no más reflejará el trabajo original + del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                            +

                            Finalmente, cualquier programa de libre distribución está constantemente amenazado + por las patentes de softwares. Buscamos evitar el peligro de que distribuidores + de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. + Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación + de patente se debe hacer permitiendo el uso por cualquier individuo, sin la + necesidad de licencia de uso.

                            +

                            Los términos y condiciones precisas para copia, distribución y modificación + siguen abajo:

                            +
                            +

                            Licencia Pública General GNU

                            +

                            TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN +

                            + +
                              + +

                            1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga + un aviso colocado por el detentor de los derechos de autor diciendo que aquel + podrá ser distribuido en las condiciones de la Licencia Pública General. El + Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado + en un Programa y significa tanto el propio Programa, como cualquier de los + trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, + un trabajo que contenga el Programa o una parte de este, en su forma original + o con modificaciones o traducido para una otra lengua (la traducción está + incluida sin limitaciones en el término ``modificación'').

                              +

                              Actividades distintas de copia, distribución y modificación no están cubiertas + por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa + no está restringido y la salida del Programa está cubierta solamente en + el caso de que su contenido contenga trabajos basados en el Programa (independientemente + de que hayan sido creados por la ejecución del Programa). Si esto es así, + depende de las funciones ejecutadas por el Programa.

                              2. + +

                            2. El código fuente del Programa, de la forma como fue recibido, puede ser + copiado y distribuido, en cualquier media, desde que sea providenciado un + aviso adecuado sobre los copyrights y la negación de garantías, y todos los + avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, + estén inalterados y que cualquier producto oriundo del Programa esté acompañado + de esta Licencia Pública General.

                              +

                              Está permitido el cobro de tasas por el acto físico de transferencia o + grabación de copias, y pueden ser dadas garantías y soporte en cambio del + cobro de valores.

                              3. + + +
                            3. +

                              Se puede modificar la copia o copias del Programa de cualquier forma que + se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir + tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                              + +
                                +

                              1. Debe existir un aviso destacado de que los datos originales fueron alterados + en los archivos y las fechas de los cambios;

                                2. + +

                              2. Debe existir un aviso de que el trabajo distribuido o publicado es, + de forma total o parcial, derivado del Programa o de alguna parte suya, + y que puede ser licenciado totalmente sin costes para terceros bajo los + términos de esta Licencia.

                                3. + +

                              3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, + en el inicio de tu ejecución, presentar la información de copyright y + de ausencia de garantías (o de que la garantía es de responsabilidad de + terceros), y que los usuarios pueden redistribuir el programa bajo estas + condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                                4. +
                              + + Estos requisitos se aplican a trabajos de modificación en general. Si + algunas secciones identificables no sean derivadas del Programa, y pueden + ser consideradas como partes independientes, entonces esta Licencia y sus + Términos no se aplican a aquellas secciones cuando distribuidas separadamente. + Pero al distribuir aquellas secciones como parte de un trabajo basado en + el Programa, la distribución, como un todo, debe contener los términos de + esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no + a cada una de las partes independientemente de quem los tenga desarrollado. + Más que tener intención de contestar los derechos sobre el trabajo desarrollado + por alguien, esta sección objetiva propiciar la correcta distribución de + trabajos derivados del Programa. + Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado + en él ni a un trabajo basado en él, a un volumen de almacenaje o media de + distribución no obliga la utilización de esta Licencia y de sus términos + al trabajo. +
                              4. + + +
                            4. +

                              Están permitidas, la copia y la distribución, del Programa (o un trabajo + basado en éste) en la forma de código objeto o ejecutable de acuerdo con los + términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                              + +
                                +

                              1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos + en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada + para manejo de softwares o

                                +
                                2. +

                              2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, + de poner a disposición a terceros, por un coste no superior al coste del + medio físico de almacenaje, una copia completa de los códigos fuente en + medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                                +
                                3. +

                              3. Esté acompañada con la misma información recibida en relación con la + oferta de la distribución del código fuente correspondiente (esta alternativa + solamente está permitida para distribuciones no comerciales y solamente + si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, + de acuerdo con la sección 2 arriba).

                                +
                                4. +
                              + El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones + en aquel trabajo. Cuando se habla en códigos fuentes completos significa + hablar de todos los fuentes de todos los módulos, además de las definiciones + de interfaces asociadas, archivos, scripts utilizados en la compilación + y instalación del ejecutable. Como una excepción excepcional, el código + fuente distribuido podrá no incluir algunos componentes que no se encuentren + en su escopo, como compilador, kernel, etc... para el SO donde el trabajo + sea ejecutado. + Si la distribución del ejecutable o objeto se hace, a través de acceso + a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente + de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos + con los objetos simultáneamente +
                              5. + +
                            5. +

                              No está permitida la copia, modificación, sublicenciamiento o distribución + del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier + tentativa de copia, modificación, sublicenciamiento o distribución del Programa + está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. + Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, + no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas + de esta Licencia.

                              6. +
                            6. +

                              No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá + documento o contrato que garantice permiso de modificación o distribución + del Programa o sus trabajos derivados. Estas acciones están prohibidas por + ley, en el caso de que no se acepten las condiciones de esta Licencia. La + modificación o distribución del Programa, o cualquier trabajo basado en éste, + implica en la aceptación de esta Licencia y de todos los términos de ésta + para copia, distribución o modificación del Programa o trabajos basados en + éste.

                              7. +
                            7. +

                              Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), + el recipiente automáticamente recibe una licencia del detentor original de + los derechos de copia, distribución o modificación del Programa objeto de + estos términos y condiciones. No pueden ser impuestas otras restricciones + en los recipientes.

                              8. + +
                            8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes + o derechos de autor, se impongan restricciones, que contradigan esta Licencia, + estos no exentan de su aplicación. Si no es posible distribuir el Programa + de forma a garantizar simultáneamente las obligaciones de esta Licencia y + otras que sean necesarias, entonces el Programa no podrá ser distribuido. +

                              Si esta Sección se considera, inválida por cualquier motivo particular + o general, su resultado implicará en la invalidación general de esta licencia + en la copia, modificación, sublicenciamiento o distribución del Programa + o trabajos basados en éste.

                              +

                              El propósito de esta sección no es, de forma alguna, incitar a quien quiera + que sea a infringir derechos reclamados en cuestiones válidas y procedentes, + y si proteger las premisas del sistema de libre distribución de software. + Muchas personas tienen hecho contribuciones generosas al sistema, en la + forma de programas, y es necesario garantizar la consistencia y credibilidad + del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución + de los softwares.

                              +

                              Esta sección pretende hacer claro los motivos que crearan las demás cláusulas + de estas Licencia.

                              9. + +
                            9. +

                              Si la distribución del Programa, dentro de los términos de esta Licencia, + tiene restricciones en algún País, por patentes o derechos de autor, el detentor + original de los derechos de autor del Programa bajo esta Licencia puede adicionar + explícitamente limitaciones geográficas de distribución, excluyendo aquellos + Países, haciendo con que la distribución solamente sea posible en los Países + no excluidos.

                              10. + +
                            10. +

                              La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) + puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública + General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos + objetivos y el espirito de la presente versión, pudiendo variar en detalles + referentes a nuevas situaciones encontradas.

                              +

                              A cada versión se da un número distinto. Si el Programa especifica, un + número de versión determinado de esta Licencia, que tenga en su contenido + la expresión ``o versión más actualizada'', es posible optar por las condiciones + de aquella versión o de cualquier versión más actualizada publicada por + la FSF.

                              11. + +
                            11. +

                              Si deseas incorporar parte del Programa en otros programas de libre distribución + de softwares hace falta autorización formal del autor. Para softwares que + la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde + que mantenido el espirito y objetivos originales de esta Licencia.

                              12. +
                            + +

                            AUSENCIA DE GARANTÍAS

                            +
                              +

                            1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER + GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE + EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS + DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, + LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD + Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS + CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y + REPAROS JUZGADOS NECESARIOS.

                              2. +

                            2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR + LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN + RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE + HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS + O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES + O DAÑOS.

                              +

                              FIN DE LA LICENCIA

                            + + +
                            +

                             

                            +

                            Apéndice

                            +

                            ¿Cómo aplicar estos términos a nuevos softwares?

                            +

                            Si has desarrollado un nuevo programa y deseas su amplia distribución para + el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, + que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                            +

                            Para esto basta con anexar este aviso al programa. Se recomienda indicar aún + en el inicio de cada archivo fuente la ausencia de garantías y una anotación + de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                            +

                            <nombre del programa y función> Copyright (C) 199X <Autor> +

                            +

                            Este programa es un software de libre distribución, que puede ser copiado + y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo + con la publicada por la Free Software Foundation, versión 2 de la licencia o + (a criterio del autor) cualquier versión posterior.

                            +

                            Este programa se distribuye en la expectativa de ser útil a sus usuarios, + pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE + ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General + 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. +

                            +

                            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:

                            +

                            Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares + NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software + de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. + Teclea 'muestra condic' para mayores detalles.

                            +

                            Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las + partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos + pueden variar o pueden ser accionados por otras interfaces como clic de ratón, + etc...

                            +

                             

                            +
                            +
                            + +www.conectiva.com + +
                            + + + + + diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt new file mode 100644 index 00000000000..3efbe1ccee7 --- /dev/null +++ b/htdocs/langs/nl_BE/html/gpl.txt @@ -0,0 +1,340 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +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 new file mode 100644 index 00000000000..778e2b02b41 --- /dev/null +++ b/htdocs/langs/nl_NL/html/gpl.txt @@ -0,0 +1,339 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van +deze licentie. \ No newline at end of file diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 03ef2767e40..eedd6a8841c 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -21,8 +21,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -30,7 +29,7 @@ * \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.350 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ */ @@ -71,14 +70,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root[]=$value; + $conf->file->dol_document_root['alt']=$value; } } From f992c4dcf86571a22ddb31f9d099be16c782c905 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Aug 2011 18:58:37 +0000 Subject: [PATCH 069/118] Work on debian package --- build/deb/config | 45 +++++++++++++++++++++++++-------------------- build/deb/postinst | 12 ++---------- build/deb/postrm | 4 +++- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/build/deb/config b/build/deb/config index fd5ea96491b..553e5ffd7f6 100644 --- a/build/deb/config +++ b/build/deb/config @@ -13,25 +13,29 @@ db_version 2.0 echo Run the dolibarr config script # Rotate old configuration -if [ "$1" = "reconfigure" ] ; then - config="/etc/dolibarr/apache.conf" - for i in $(seq 8 -1 0) ; do - if [ -f ${config}.$i ] ; then - mv ${config}.$i ${config}.$(($i +1)) - fi - done - mv ${config} ${config}.0 -fi +#if [ "$1" = "reconfigure" ] ; then +# config="/etc/dolibarr/apache.conf" +# if [ -f $config ] ; then +# for i in $(seq 8 -1 0) ; do +# if [ -f ${config}.$i ] ; then +# mv ${config}.$i ${config}.$(($i +1)) +# fi +# done +# mv ${config} ${config}.0 +# fi +#fi # Rotate old configuration -if [ "$1" = "reconfigure" ] ; then - config="/etc/dolibarr/lighttpd.conf" - for i in $(seq 8 -1 0) ; do - if [ -f ${config}.$i ] ; then - mv ${config}.$i ${config}.$(($i +1)) - fi - done - mv ${config} ${config}.0 -fi +#if [ "$1" = "reconfigure" ] ; then +# config="/etc/dolibarr/lighttpd.conf" +# if [ -f $config ] ; then +# for i in $(seq 8 -1 0) ; do +# if [ -f ${config}.$i ] ; then +# mv ${config}.$i ${config}.$(($i +1)) +# fi +# done +# mv ${config} ${config}.0 +# fi +#fi db_capb backup @@ -39,8 +43,9 @@ db_capb backup db_title "dolibarr" || true -# Ask for web server type. -#db_input critical "dolibarr/webserver" || true +# Ask if we must delete database +echo "Ask for web server to setup" +db_input critical dolibarr/reconfigure-webserver || true if db_go ; then okcancel="1" diff --git a/build/deb/postinst b/build/deb/postinst index 9f103d8876d..e0bba1be4da 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -20,7 +20,7 @@ lighttpd_install() { if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then if which lighty-enable-mod >/dev/null 2>&1 ; then echo "Add link for Lighttpd config file" - ln -s /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf + ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf # We enabled it lighty-enable-mod dolibarr fastcgi-php else @@ -33,7 +33,7 @@ apache_install() { webserver=$1 if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then echo "Add link for Apache config file" - ln -s /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf + ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf fi } @@ -92,14 +92,6 @@ case "$1" in fi - # Reconfigure web server - db_reset dolibarr/reconfigure-webserver - - # Ask if we must delete database - echo "Ask for web server to setup" - db_input critical dolibarr/reconfigure-webserver || true - db_go || true - db_get dolibarr/reconfigure-webserver webservers="$RET" diff --git a/build/deb/postrm b/build/deb/postrm index dd05ee90379..27ce3777b7e 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -65,10 +65,12 @@ case "$1" in # Call when we upgrade upgrade) + echo "postrm upgrade" ;; # Call when we uninstall remove) + echo "postrm remove" rm -f $lockfile # Reconfigure web server @@ -98,7 +100,7 @@ case "$1" in # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers" + echo "postrm purge" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" From 1c8e6b6f10194858d76e440f49fcc97f778b9482 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Aug 2011 19:10:27 +0000 Subject: [PATCH 070/118] Work on debian package From 4a5d8e25f84ed75068dfb399110fd555f34cc245 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Aug 2011 22:03:50 +0000 Subject: [PATCH 071/118] Fix: Restore feature to have code inside language list From f2be039f0d34c241b8a799994c33f604d9338ee9 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 2 Aug 2011 09:31:06 +0000 Subject: [PATCH 072/118] Trad: More accurate trad From e5ec83eeb1135f945f22f3e9faef94ec9dd4497b Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 2 Aug 2011 12:44:20 +0000 Subject: [PATCH 073/118] bug #33926: Don't can edit contract lines From 93d00835928800021b250062ef99058eead95c4f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 2 Aug 2011 21:53:58 +0000 Subject: [PATCH 074/118] Fix: Avoid errors into rpm packages From 48f1f4e1470391589108a31a2a06224a61f4b9bf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 23:54:11 +0000 Subject: [PATCH 075/118] Fix: Avoid errors into rpm packages --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/postinst | 100 ++++---- build/deb/postrm | 119 ++++----- build/makepack-dolibarr.pl | 36 +-- 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 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 33 +-- htdocs/admin/perms.php | 32 +-- htdocs/admin/proxy.php | 7 +- htdocs/admin/security_other.php | 7 +- htdocs/admin/system/constall.php | 5 +- htdocs/cashdesk/tpl/menu.tpl.php | 13 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/prelevement/create.php | 7 +- htdocs/contrat/fiche.php | 6 +- htdocs/core/class/conf.class.php | 6 +- htdocs/core/class/cookie.class.php | 5 +- htdocs/core/class/translate.class.php | 7 +- htdocs/imports/import.php | 7 +- htdocs/langs/es_ES/html/gpl.html | 330 ------------------------- htdocs/langs/nl_BE/html/gpl.txt | 340 -------------------------- htdocs/langs/nl_NL/html/gpl.txt | 339 ------------------------- htdocs/master.inc.php | 9 +- 29 files changed, 260 insertions(+), 1360 deletions(-) delete mode 100644 htdocs/langs/es_ES/html/gpl.html delete mode 100644 htdocs/langs/nl_BE/html/gpl.txt delete mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index d73d7a99219..edb46ffd5a3 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,13 +22,12 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build binary only package +# dpkg -b To build package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# dpkg-reconfigure -plow package Reconfigure package +# # dpkg -L packagename List content of installed package -# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index 3382966714b..b035f18ae1d 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 + -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/postinst b/build/deb/postinst index e0bba1be4da..ca5fd1645dd 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,5 +1,7 @@ #!/bin/sh # postinst script for dolibarr +# +# see: dh_installdeb(1) set -e @@ -14,31 +16,6 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - - -lighttpd_install() { - if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - if which lighty-enable-mod >/dev/null 2>&1 ; then - echo "Add link for Lighttpd config file" - ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf - # We enabled it - lighty-enable-mod dolibarr fastcgi-php - else - echo "Lighttpd not installed, skipping" - fi - fi -} - -apache_install() { - webserver=$1 - if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Add link for Apache config file" - ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - . /usr/share/debconf/confmodule db_version 2.0 @@ -50,6 +27,8 @@ echo Run the dolibarr postinst script # Define vars docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" installconfig="/etc/dolibarr/install.forced.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php" @@ -65,6 +44,10 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir + # Copy apache.conf file into target directory + #mkdir -p /etc/dolibarr + #cp -p $apachefileorig $apacheconfig + # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -91,15 +74,21 @@ case "$1" in chmod -R 660 $config fi - - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - + # Get the web server type (use db_get for interactive mode). + #db_reset "dolibarr/webserver" + #db_get "dolibarr/webserver" # Read value for webserver. + #webserver="$RET" + + case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; + esac + # Set up web server. - for webserver in $webservers ; do - webserver=${webserver%,} - echo Complete config of server $webserver + for server in $webservers ; do + echo Complete config of server $server # Detect webuser and webgroup webuser= @@ -117,31 +106,26 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config + + # Add link to config file + echo Setup web server $server to add dolibarr config file + ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf + done - # Restart web server. - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_install - else - apache_install $webserver - fi - # Reload webserver in any case, configuration might have changed - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $webserver reload 3>/dev/null || true - else - echo Restart web server $server using $server reload - /etc/init.d/$webserver reload 3>/dev/null || true - fi - fi + # Restart servers + servers="apache2-ssl apache2 mysql" + # Another way to restart + for server in $servers ; do + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $server reload || true + else + echo Restart web server $server using $server reload + /etc/init.d/$server reload || true + fi done - echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -152,13 +136,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument $1" >&2 + echo "postinst called with unknown argument \`$1'" >&2 exit 0 ;; esac -#DEBHELPER# - db_stop +#DEBHELPER# + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 27ce3777b7e..9eae81b022b 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,36 +17,7 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - -lighttpd_remove() { - if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - echo "Remove link for Lighttpd config file" - rm -f /etc/lighttpd/conf-available/50-dolibarr.conf - if which lighty-enable-mod >/dev/null 2>&1 ; then - lighty-disable-mod dolibarr - else - echo "Lighttpd not installed, skipping" - fi - # See bug #448682 - if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then - echo 'Manually deleting lighttpd/dolibarr configuration link' - rm /etc/lighttpd/conf-enabled/50-dolibarr.conf - fi - fi -} - -apache_remove() { - if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Remove link for Apache config file" - rm -f /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule -fi +. /usr/share/debconf/confmodule db_version 2.0 @@ -55,62 +26,63 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" +export webserver="" +# Allows us to loop and substitute in one pass +case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; +esac + case "$1" in # Call when we upgrade upgrade) - echo "postrm upgrade" ;; # Call when we uninstall remove) - echo "postrm remove" rm -f $lockfile - # Reconfigure web server - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - - # Restart web servers - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_remove - else - apache_remove $webserver - fi - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $webserver reload 3>/dev/null || true - else - /etc/init.d/$webserver reload 3>/dev/null || true - fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete link $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge" + echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical dolibarr/postrm || true + db_input critical "dolibarr/postrm" || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get dolibarr/postrm + db_get "dolibarr/postrm" set -e if [ "$RET" = "true" ] ; then @@ -213,12 +185,41 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete file $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" + fi + done + rm -rf /etc/dolibarr + # Restart servers + for server in $restart ; do + # We disable blocking errors + set +e + echo "Restart server $server if exists" + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $server reload || true + else + /etc/init.d/$server reload || true + fi + # We restore blocking errors + set -e + done + # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset dolibarr/reconfigure-webserver - db_reset dolibarr/postrm + db_reset "dolibarr/postrm" set -e #db_purge @@ -228,7 +229,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument $1" >&2 + echo "postrm called with unknown argument \`$1'" >&2 exit 0 ;; esac diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 20c5ba415e9..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.129 2011/08/01 18:22:26 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -318,9 +318,6 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; } # Build package for each target @@ -572,8 +569,6 @@ if ($nboftargetok) { if ($target eq 'DEB') { - $olddir=getcwd(); - $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -676,22 +671,19 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache and lighttpd conf files + # Apache conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; + + # Dolibarr conf files + # TODO # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -737,15 +729,17 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - # Creation of binary package (to build without sources) - #print "Go to directory $BUILDROOT\n"; - #chdir("$BUILDROOT"); + print "Go to directory $BUILDROOT\n"; + $olddir=getcwd(); + chdir("$BUILDROOT"); + + # Creation of binary package (to build without sources) #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Prepare source package + # Creation of source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -757,7 +751,6 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; - $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -773,9 +766,6 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; - - # Creation of source package - print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; 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/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/proxy.php b/htdocs/admin/proxy.php index f02e3d6203a..2c284c5cae8 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ */ require("../main.inc.php"); @@ -206,5 +205,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); +llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c0aaaa86213..c1d629f7b7b 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ */ require("../main.inc.php"); @@ -348,5 +347,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); +llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); ?> diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index a07b28bd2cf..f478b65e3a8 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.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/constall.php * \brief Page to show all Dolibarr setup (config file and database constants) - * \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $ + * \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $ */ require("../../main.inc.php"); 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/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 5ba2ef8997e..0c262ba2936 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ */ require("./pre.inc.php"); @@ -386,5 +385,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); +llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 9ee1f551048..525160df9ef 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ */ require("./pre.inc.php"); @@ -608,5 +607,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); +llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); ?> diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 689e2639773..79d00ae00c7 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ + * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -276,5 +275,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); +llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); ?> diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index b0145e14628..0cf91d64abc 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -23,7 +23,7 @@ * \file htdocs/contrat/fiche.php * \ingroup contrat * \brief Page of a contract - * \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $ + * \version $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $ */ require ("../main.inc.php"); @@ -757,7 +757,7 @@ else $var=!$var; - if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid) + if ($action != 'editline' || $_GET["rowid"] != $objp->rowid) { print ''; // Libelle @@ -1286,5 +1286,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $'); +llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index c5664164e74..acb0b5d9167 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -24,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ + * \version $Id: conf.class.php,v 1.63 2011/07/31 23:45:13 eldy Exp $ */ @@ -144,13 +144,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 07fed567b48..c21450bb8cb 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ + * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 4496c18ff1f..bf30794f153 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -23,7 +23,7 @@ * \brief File for Tanslate class * \author Eric Seigne * \author Laurent Destailleur - * \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $ + * \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $ */ @@ -512,10 +512,9 @@ class Translate { * Return list of all available languages * @param langdir Directory to scan * @param maxlength Max length for each value in combo box (will be truncated) - * @param usecode Show code instead of country name for language variant * @return array List of languages */ - function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0) + function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0) { global $conf; @@ -528,7 +527,7 @@ class Translate { { $this->load("languages"); - if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE)) + if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE) { $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength); } diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index c03b55d2347..97d4d8252d3 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ + * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ */ require_once("../main.inc.php"); @@ -1669,7 +1668,7 @@ print '
                              '; $db->close(); -llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); +llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); /* diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html deleted file mode 100644 index 38e0f007a15..00000000000 --- a/htdocs/langs/es_ES/html/gpl.html +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - -H. Licencia Pública GNU - - - - - - - - - - - - - -

                              Licencia Pública GNU

                              - - - - -
                              - -GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 - -
                              - -

                              Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, - MA 02139, USA.

                              -

                              Está permitido, a cualquier persona, copiar y distribuir copias tal cual de - este documento de licencia, sin la introducción de cualquier cambio. -

                              - -
                              -

                              Introducción

                              -

                              Las licencias de muchos softwares se desarrollan para asegurar la libertad - de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, - al contrario, pretende garantizar la libertad de compartir y alterar softwares - de libre distribución - volviéndolos de libre distribución también para cualquier - de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares - de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla - (algunos softwares de la FSF son cubiertos por la GNU Library General Public - License).

                              -

                              Cuando nos referimos a softwares de libre distribución, nos referimos a la - libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar - la libertad de distribución de copias de softwares de libre distribución (y - cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos - fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se - hacen algunas restricciones, para asegurar los derechos de los programadores, - prohibiendo a todas las personas su negación o la solicitación de su abdicación. - Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución - o modificación del software.

                              -

                              Por ejemplo, al distribuirse copias de determinado programa, por una tasa - determinada o gratuitamente, se debe informar sobre todos los derechos incidentes - sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia - Pública General GNU.

                              -

                              La protección de los derechos envuelve dos pasos: (1) copyright del software - y (2) licencia que da permiso legal para copia, distribución y/o modificación - del softwares.

                              -

                              Aún para la protección de la FSF y del autor es importante que todos entiendan - que no hay garantías para softwares de libre distribución. Si software se modifica - por alguien y lo pasa adelante, este software no más reflejará el trabajo original - del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                              -

                              Finalmente, cualquier programa de libre distribución está constantemente amenazado - por las patentes de softwares. Buscamos evitar el peligro de que distribuidores - de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. - Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación - de patente se debe hacer permitiendo el uso por cualquier individuo, sin la - necesidad de licencia de uso.

                              -

                              Los términos y condiciones precisas para copia, distribución y modificación - siguen abajo:

                              -
                              -

                              Licencia Pública General GNU

                              -

                              TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN -

                              - -
                                - -

                              1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga - un aviso colocado por el detentor de los derechos de autor diciendo que aquel - podrá ser distribuido en las condiciones de la Licencia Pública General. El - Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado - en un Programa y significa tanto el propio Programa, como cualquier de los - trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, - un trabajo que contenga el Programa o una parte de este, en su forma original - o con modificaciones o traducido para una otra lengua (la traducción está - incluida sin limitaciones en el término ``modificación'').

                                -

                                Actividades distintas de copia, distribución y modificación no están cubiertas - por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa - no está restringido y la salida del Programa está cubierta solamente en - el caso de que su contenido contenga trabajos basados en el Programa (independientemente - de que hayan sido creados por la ejecución del Programa). Si esto es así, - depende de las funciones ejecutadas por el Programa.

                                2. - -

                              2. El código fuente del Programa, de la forma como fue recibido, puede ser - copiado y distribuido, en cualquier media, desde que sea providenciado un - aviso adecuado sobre los copyrights y la negación de garantías, y todos los - avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, - estén inalterados y que cualquier producto oriundo del Programa esté acompañado - de esta Licencia Pública General.

                                -

                                Está permitido el cobro de tasas por el acto físico de transferencia o - grabación de copias, y pueden ser dadas garantías y soporte en cambio del - cobro de valores.

                                3. - - -
                              3. -

                                Se puede modificar la copia o copias del Programa de cualquier forma que - se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir - tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                                - -
                                  -

                                1. Debe existir un aviso destacado de que los datos originales fueron alterados - en los archivos y las fechas de los cambios;

                                  2. - -

                                2. Debe existir un aviso de que el trabajo distribuido o publicado es, - de forma total o parcial, derivado del Programa o de alguna parte suya, - y que puede ser licenciado totalmente sin costes para terceros bajo los - términos de esta Licencia.

                                  3. - -

                                3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, - en el inicio de tu ejecución, presentar la información de copyright y - de ausencia de garantías (o de que la garantía es de responsabilidad de - terceros), y que los usuarios pueden redistribuir el programa bajo estas - condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                                  4. -
                                - - Estos requisitos se aplican a trabajos de modificación en general. Si - algunas secciones identificables no sean derivadas del Programa, y pueden - ser consideradas como partes independientes, entonces esta Licencia y sus - Términos no se aplican a aquellas secciones cuando distribuidas separadamente. - Pero al distribuir aquellas secciones como parte de un trabajo basado en - el Programa, la distribución, como un todo, debe contener los términos de - esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no - a cada una de las partes independientemente de quem los tenga desarrollado. - Más que tener intención de contestar los derechos sobre el trabajo desarrollado - por alguien, esta sección objetiva propiciar la correcta distribución de - trabajos derivados del Programa. - Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado - en él ni a un trabajo basado en él, a un volumen de almacenaje o media de - distribución no obliga la utilización de esta Licencia y de sus términos - al trabajo. -
                                4. - - -
                              4. -

                                Están permitidas, la copia y la distribución, del Programa (o un trabajo - basado en éste) en la forma de código objeto o ejecutable de acuerdo con los - términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                                - -
                                  -

                                1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos - en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada - para manejo de softwares o

                                  -
                                  2. -

                                2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, - de poner a disposición a terceros, por un coste no superior al coste del - medio físico de almacenaje, una copia completa de los códigos fuente en - medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                                  -
                                  3. -

                                3. Esté acompañada con la misma información recibida en relación con la - oferta de la distribución del código fuente correspondiente (esta alternativa - solamente está permitida para distribuciones no comerciales y solamente - si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, - de acuerdo con la sección 2 arriba).

                                  -
                                  4. -
                                - El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones - en aquel trabajo. Cuando se habla en códigos fuentes completos significa - hablar de todos los fuentes de todos los módulos, además de las definiciones - de interfaces asociadas, archivos, scripts utilizados en la compilación - y instalación del ejecutable. Como una excepción excepcional, el código - fuente distribuido podrá no incluir algunos componentes que no se encuentren - en su escopo, como compilador, kernel, etc... para el SO donde el trabajo - sea ejecutado. - Si la distribución del ejecutable o objeto se hace, a través de acceso - a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente - de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos - con los objetos simultáneamente -
                                5. - -
                              5. -

                                No está permitida la copia, modificación, sublicenciamiento o distribución - del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier - tentativa de copia, modificación, sublicenciamiento o distribución del Programa - está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. - Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, - no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas - de esta Licencia.

                                6. -
                              6. -

                                No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá - documento o contrato que garantice permiso de modificación o distribución - del Programa o sus trabajos derivados. Estas acciones están prohibidas por - ley, en el caso de que no se acepten las condiciones de esta Licencia. La - modificación o distribución del Programa, o cualquier trabajo basado en éste, - implica en la aceptación de esta Licencia y de todos los términos de ésta - para copia, distribución o modificación del Programa o trabajos basados en - éste.

                                7. -
                              7. -

                                Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), - el recipiente automáticamente recibe una licencia del detentor original de - los derechos de copia, distribución o modificación del Programa objeto de - estos términos y condiciones. No pueden ser impuestas otras restricciones - en los recipientes.

                                8. - -
                              8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes - o derechos de autor, se impongan restricciones, que contradigan esta Licencia, - estos no exentan de su aplicación. Si no es posible distribuir el Programa - de forma a garantizar simultáneamente las obligaciones de esta Licencia y - otras que sean necesarias, entonces el Programa no podrá ser distribuido. -

                                Si esta Sección se considera, inválida por cualquier motivo particular - o general, su resultado implicará en la invalidación general de esta licencia - en la copia, modificación, sublicenciamiento o distribución del Programa - o trabajos basados en éste.

                                -

                                El propósito de esta sección no es, de forma alguna, incitar a quien quiera - que sea a infringir derechos reclamados en cuestiones válidas y procedentes, - y si proteger las premisas del sistema de libre distribución de software. - Muchas personas tienen hecho contribuciones generosas al sistema, en la - forma de programas, y es necesario garantizar la consistencia y credibilidad - del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución - de los softwares.

                                -

                                Esta sección pretende hacer claro los motivos que crearan las demás cláusulas - de estas Licencia.

                                9. - -
                              9. -

                                Si la distribución del Programa, dentro de los términos de esta Licencia, - tiene restricciones en algún País, por patentes o derechos de autor, el detentor - original de los derechos de autor del Programa bajo esta Licencia puede adicionar - explícitamente limitaciones geográficas de distribución, excluyendo aquellos - Países, haciendo con que la distribución solamente sea posible en los Países - no excluidos.

                                10. - -
                              10. -

                                La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) - puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública - General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos - objetivos y el espirito de la presente versión, pudiendo variar en detalles - referentes a nuevas situaciones encontradas.

                                -

                                A cada versión se da un número distinto. Si el Programa especifica, un - número de versión determinado de esta Licencia, que tenga en su contenido - la expresión ``o versión más actualizada'', es posible optar por las condiciones - de aquella versión o de cualquier versión más actualizada publicada por - la FSF.

                                11. - -
                              11. -

                                Si deseas incorporar parte del Programa en otros programas de libre distribución - de softwares hace falta autorización formal del autor. Para softwares que - la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde - que mantenido el espirito y objetivos originales de esta Licencia.

                                12. -
                              - -

                              AUSENCIA DE GARANTÍAS

                              -
                                -

                              1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER - GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE - EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS - DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, - LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD - Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS - CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y - REPAROS JUZGADOS NECESARIOS.

                                2. -

                              2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR - LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN - RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE - HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS - O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES - O DAÑOS.

                                -

                                FIN DE LA LICENCIA

                              - - -
                              -

                               

                              -

                              Apéndice

                              -

                              ¿Cómo aplicar estos términos a nuevos softwares?

                              -

                              Si has desarrollado un nuevo programa y deseas su amplia distribución para - el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, - que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                              -

                              Para esto basta con anexar este aviso al programa. Se recomienda indicar aún - en el inicio de cada archivo fuente la ausencia de garantías y una anotación - de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                              -

                              <nombre del programa y función> Copyright (C) 199X <Autor> -

                              -

                              Este programa es un software de libre distribución, que puede ser copiado - y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo - con la publicada por la Free Software Foundation, versión 2 de la licencia o - (a criterio del autor) cualquier versión posterior.

                              -

                              Este programa se distribuye en la expectativa de ser útil a sus usuarios, - pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE - ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General - 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. -

                              -

                              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:

                              -

                              Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares - NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software - de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. - Teclea 'muestra condic' para mayores detalles.

                              -

                              Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las - partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos - pueden variar o pueden ser accionados por otras interfaces como clic de ratón, - etc...

                              -

                               

                              -
                              -
                              - -www.conectiva.com - -
                              - - - - - diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt deleted file mode 100644 index 3efbe1ccee7..00000000000 --- a/htdocs/langs/nl_BE/html/gpl.txt +++ /dev/null @@ -1,340 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -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 deleted file mode 100644 index 778e2b02b41..00000000000 --- a/htdocs/langs/nl_NL/html/gpl.txt +++ /dev/null @@ -1,339 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van -deze licentie. \ No newline at end of file diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index eedd6a8841c..03ef2767e40 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -21,7 +21,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -29,7 +30,7 @@ * \ingroup core * \brief File that defines environment for all Dolibarr process (pages or scripts) * This script reads the conf file, init $lang, $db and and empty $user - * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ + * \version $Id: master.inc.php,v 1.350 2011/07/30 10:23:24 eldy Exp $ */ @@ -70,14 +71,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root['alt']=$value; + $conf->file->dol_document_root[]=$value; } } From 2ec17e7cf56039392239a2e51f51beccc58bdafd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Aug 2011 00:38:49 +0000 Subject: [PATCH 076/118] Fix: bug #33900 : Third party name reset after the autocompletion of city name From 5e00a97ca23c63338f7834112ca5512531ab7640 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Aug 2011 12:08:31 +0000 Subject: [PATCH 077/118] Fix: case problem From f3414f4a047dc350a25f28b15d087530c304b7c0 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Aug 2011 12:25:14 +0000 Subject: [PATCH 078/118] New: possibility to use includes/modules in external modules dir --- htdocs/admin/modules.php | 36 ++++++++++++++++++++++++++++++------ htdocs/master.inc.php | 9 ++++----- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index a907f47663a..a5025c44000 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2010 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ /** * \file htdocs/admin/modules.php * \brief Page to activate/disable all modules - * \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: modules.php,v 1.158 2011/08/01 12:28:09 hregis Exp $ */ require("../main.inc.php"); @@ -79,12 +79,36 @@ $modules = array(); $orders = array(); $categ = array(); $dirmod = array(); +$modulesdir = array(); $i = 0; // is a sequencer of modules found $j = 0; // j is module number. Automatically affected if module number not defined. -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                              "; dol_syslog("Scan directory ".$dir." for modules"); @@ -449,5 +473,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $'); +llxFooter('$Date: 2011/08/01 12:28:09 $ - $Revision: 1.158 $'); ?> diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 03ef2767e40..eedd6a8841c 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -21,8 +21,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -30,7 +29,7 @@ * \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.350 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ */ @@ -71,14 +70,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root[]=$value; + $conf->file->dol_document_root['alt']=$value; } } From 272de11d60c779ad3e2c60e6fa31862c10ca7694 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Aug 2011 12:25:15 +0000 Subject: [PATCH 079/118] New: possibility to use includes/modules in external modules dir --- htdocs/admin/modules.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index a5025c44000..671bd69a0e4 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -22,7 +22,7 @@ /** * \file htdocs/admin/modules.php * \brief Page to activate/disable all modules - * \version $Id: modules.php,v 1.158 2011/08/01 12:28:09 hregis Exp $ + * \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $ */ require("../main.inc.php"); @@ -89,10 +89,10 @@ foreach ($conf->file->dol_document_root as $type => $dirroot) if ($type == 'alt') { - $handle=@opendir($dirroot); - if (is_resource($handle)) + $althandle=@opendir($dirroot); + if (is_resource($althandle)) { - while (($file = readdir($handle))!==false) + while (($file = readdir($althandle))!==false) { if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') { @@ -102,7 +102,6 @@ foreach ($conf->file->dol_document_root as $type => $dirroot) } } } - closedir($handle); } } } @@ -473,5 +472,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/01 12:28:09 $ - $Revision: 1.158 $'); +llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $'); ?> From 563f8c1ea12b02609aa295fec84b53e2607c74c0 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Aug 2011 12:53:37 +0000 Subject: [PATCH 080/118] New: possibility to use includes/modules in external modules dir --- htdocs/admin/perms.php | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index bee00b52906..6af9b54e7f0 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -21,7 +21,7 @@ * \file htdocs/admin/perms.php * \ingroup core * \brief Page d'administration/configuration des permissions par defaut - * \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $ + * \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $ */ require("../main.inc.php"); @@ -76,10 +76,34 @@ $db->begin(); // Charge les modules soumis a permissions $modules = array(); -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +$modulesdir = array(); +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                              "; $handle=@opendir($dir); @@ -194,5 +218,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $'); +llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $'); ?> From 5e31280b8a17831c044973c398b0f0c90b81aef1 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Aug 2011 13:15:53 +0000 Subject: [PATCH 081/118] New: possibility to use includes/modules in external modules dir From 762c0f646bab8d35b65dd2b40facecdef5f2b2fc Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Aug 2011 13:26:21 +0000 Subject: [PATCH 082/118] Fix: rename inc to includes --- dev/skeletons/modMyModule.class.php | 4 ++-- htdocs/admin/boxes.php | 8 ++++---- htdocs/core/class/conf.class.php | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 3cc548e1c0a..d7172d651f0 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -27,7 +27,7 @@ * \file htdocs/includes/modules/modMyModule.class.php * \ingroup mymodule * \brief Description and activation file for module MyModule - * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $ + * \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); @@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='generic'; - // Defined if the directory /mymodule/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 718c842d046..34e7f48cea8 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -20,7 +20,7 @@ /** * \file htdocs/admin/boxes.php * \brief Page to setup boxes - * \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $ */ require("../main.inc.php"); @@ -278,7 +278,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -394,7 +394,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -470,5 +470,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $'); +llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index acb0b5d9167..c5664164e74 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -24,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.63 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ */ @@ -144,13 +144,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard + $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard + $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/'; } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) From 5f3e387988876ee328527daa2c6cc69e765d9e71 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Aug 2011 18:22:25 +0000 Subject: [PATCH 083/118] Work on debian package --- build/deb/README | 5 +- build/deb/config | 45 +++++++------- build/deb/postinst | 108 +++++++++++++++++++++------------- build/deb/postrm | 117 ++++++++++++++++++------------------- build/makepack-dolibarr.pl | 36 +++++++----- 5 files changed, 169 insertions(+), 142 deletions(-) diff --git a/build/deb/README b/build/deb/README index edb46ffd5a3..d73d7a99219 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build package +# dpkg -b To build binary only package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# +# dpkg-reconfigure -plow package Reconfigure package # dpkg -L packagename List content of installed package +# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/config b/build/deb/config index 553e5ffd7f6..fd5ea96491b 100644 --- a/build/deb/config +++ b/build/deb/config @@ -13,29 +13,25 @@ db_version 2.0 echo Run the dolibarr config script # Rotate old configuration -#if [ "$1" = "reconfigure" ] ; then -# config="/etc/dolibarr/apache.conf" -# if [ -f $config ] ; then -# for i in $(seq 8 -1 0) ; do -# if [ -f ${config}.$i ] ; then -# mv ${config}.$i ${config}.$(($i +1)) -# fi -# done -# mv ${config} ${config}.0 -# fi -#fi +if [ "$1" = "reconfigure" ] ; then + config="/etc/dolibarr/apache.conf" + for i in $(seq 8 -1 0) ; do + if [ -f ${config}.$i ] ; then + mv ${config}.$i ${config}.$(($i +1)) + fi + done + mv ${config} ${config}.0 +fi # Rotate old configuration -#if [ "$1" = "reconfigure" ] ; then -# config="/etc/dolibarr/lighttpd.conf" -# if [ -f $config ] ; then -# for i in $(seq 8 -1 0) ; do -# if [ -f ${config}.$i ] ; then -# mv ${config}.$i ${config}.$(($i +1)) -# fi -# done -# mv ${config} ${config}.0 -# fi -#fi +if [ "$1" = "reconfigure" ] ; then + config="/etc/dolibarr/lighttpd.conf" + for i in $(seq 8 -1 0) ; do + if [ -f ${config}.$i ] ; then + mv ${config}.$i ${config}.$(($i +1)) + fi + done + mv ${config} ${config}.0 +fi db_capb backup @@ -43,9 +39,8 @@ db_capb backup db_title "dolibarr" || true -# Ask if we must delete database -echo "Ask for web server to setup" -db_input critical dolibarr/reconfigure-webserver || true +# Ask for web server type. +#db_input critical "dolibarr/webserver" || true if db_go ; then okcancel="1" diff --git a/build/deb/postinst b/build/deb/postinst index ca5fd1645dd..9f103d8876d 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,7 +1,5 @@ #!/bin/sh # postinst script for dolibarr -# -# see: dh_installdeb(1) set -e @@ -16,6 +14,31 @@ set -e # for details, see /usr/share/doc/packaging-manual/ + + +lighttpd_install() { + if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + if which lighty-enable-mod >/dev/null 2>&1 ; then + echo "Add link for Lighttpd config file" + ln -s /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf + # We enabled it + lighty-enable-mod dolibarr fastcgi-php + else + echo "Lighttpd not installed, skipping" + fi + fi +} + +apache_install() { + webserver=$1 + if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Add link for Apache config file" + ln -s /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + . /usr/share/debconf/confmodule db_version 2.0 @@ -27,8 +50,6 @@ 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" @@ -44,10 +65,6 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir - # Copy apache.conf file into target directory - #mkdir -p /etc/dolibarr - #cp -p $apachefileorig $apacheconfig - # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -74,21 +91,23 @@ case "$1" in chmod -R 660 $config fi - # Get the web server type (use db_get for interactive mode). - #db_reset "dolibarr/webserver" - #db_get "dolibarr/webserver" # Read value for webserver. - #webserver="$RET" - - case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; - esac - + + # Reconfigure web server + db_reset dolibarr/reconfigure-webserver + + # Ask if we must delete database + echo "Ask for web server to setup" + db_input critical dolibarr/reconfigure-webserver || true + db_go || true + + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + # Set up web server. - for server in $webservers ; do - echo Complete config of server $server + for webserver in $webservers ; do + webserver=${webserver%,} + echo Complete config of server $webserver # Detect webuser and webgroup webuser= @@ -106,26 +125,31 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config - - # Add link to config file - echo Setup web server $server to add dolibarr config file - ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf - done - # Restart servers - servers="apache2-ssl apache2 mysql" - # Another way to restart - for server in $servers ; do - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $server reload || true - else - echo Restart web server $server using $server reload - /etc/init.d/$server reload || true - fi + # Restart web server. + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_install + else + apache_install $webserver + fi + # Reload webserver in any case, configuration might have changed + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $webserver reload 3>/dev/null || true + else + echo Restart web server $server using $server reload + /etc/init.d/$webserver reload 3>/dev/null || true + fi + fi done + echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -136,13 +160,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument $1" >&2 exit 0 ;; esac -db_stop - #DEBHELPER# +db_stop + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 9eae81b022b..dd05ee90379 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,7 +17,36 @@ set -e # for details, see /usr/share/doc/packaging-manual/ -. /usr/share/debconf/confmodule + +lighttpd_remove() { + if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + echo "Remove link for Lighttpd config file" + rm -f /etc/lighttpd/conf-available/50-dolibarr.conf + if which lighty-enable-mod >/dev/null 2>&1 ; then + lighty-disable-mod dolibarr + else + echo "Lighttpd not installed, skipping" + fi + # See bug #448682 + if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then + echo 'Manually deleting lighttpd/dolibarr configuration link' + rm /etc/lighttpd/conf-enabled/50-dolibarr.conf + fi + fi +} + +apache_remove() { + if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Remove link for Apache config file" + rm -f /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi db_version 2.0 @@ -26,22 +55,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="" -# Allows us to loop and substitute in one pass -case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; -esac - case "$1" in @@ -53,36 +71,44 @@ case "$1" in 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" + # Reconfigure web server + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + + # Restart web servers + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_remove + else + apache_remove $webserver + fi + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload 3>/dev/null || true + else + /etc/init.d/$webserver reload 3>/dev/null || true + fi fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" + echo "postrm purge webservers=$webservers" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical "dolibarr/postrm" || true + db_input critical dolibarr/postrm || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get "dolibarr/postrm" + db_get dolibarr/postrm set -e if [ "$RET" = "true" ] ; then @@ -185,41 +211,12 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi - # Remove include files - export restart="" - for server in $webservers ; do - export conffile="/etc/$server/conf.d/dolibarr.conf" - if [ -f $conffile ] ; - then - echo Delete file $conffile - rm -f $conffile - status=purge - fi - - if [ "x$status" = "xpurge" ] ; - then restart="$restart $server" - fi - done - rm -rf /etc/dolibarr - # Restart servers - for server in $restart ; do - # We disable blocking errors - set +e - echo "Restart server $server if exists" - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $server reload || true - else - /etc/init.d/$server reload || true - fi - # We restore blocking errors - set -e - done - # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset "dolibarr/postrm" + db_reset dolibarr/reconfigure-webserver + db_reset dolibarr/postrm set -e #db_purge @@ -229,7 +226,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "postrm called with unknown argument $1" >&2 exit 0 ;; esac diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index d3c47e6b28d..20c5ba415e9 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.129 2011/08/01 18:22:26 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -318,6 +318,9 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; } # Build package for each target @@ -569,6 +572,8 @@ if ($nboftargetok) { if ($target eq 'DEB') { + $olddir=getcwd(); + $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -671,19 +676,22 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache conf files + # Apache and lighttpd conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - - # Dolibarr conf files - # TODO + print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -729,17 +737,15 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - print "Go to directory $BUILDROOT\n"; - $olddir=getcwd(); - chdir("$BUILDROOT"); - - # Creation of binary package (to build without sources) + # Creation of binary package (to build without sources) + #print "Go to directory $BUILDROOT\n"; + #chdir("$BUILDROOT"); #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Creation of source package + # Prepare source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -751,6 +757,7 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; + $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -766,6 +773,9 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; + + # Creation of source package + print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; From 8303aa2713ba7e2330492360e5c71395d4f3bef1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Aug 2011 18:58:37 +0000 Subject: [PATCH 084/118] Work on debian package --- build/deb/changelog | 2 +- build/deb/config | 45 +++++++++++++++++++++++++-------------------- build/deb/postinst | 12 ++---------- build/deb/postrm | 4 +++- 4 files changed, 31 insertions(+), 32 deletions(-) diff --git a/build/deb/changelog b/build/deb/changelog index b035f18ae1d..3382966714b 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 + -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/config b/build/deb/config index fd5ea96491b..553e5ffd7f6 100644 --- a/build/deb/config +++ b/build/deb/config @@ -13,25 +13,29 @@ db_version 2.0 echo Run the dolibarr config script # Rotate old configuration -if [ "$1" = "reconfigure" ] ; then - config="/etc/dolibarr/apache.conf" - for i in $(seq 8 -1 0) ; do - if [ -f ${config}.$i ] ; then - mv ${config}.$i ${config}.$(($i +1)) - fi - done - mv ${config} ${config}.0 -fi +#if [ "$1" = "reconfigure" ] ; then +# config="/etc/dolibarr/apache.conf" +# if [ -f $config ] ; then +# for i in $(seq 8 -1 0) ; do +# if [ -f ${config}.$i ] ; then +# mv ${config}.$i ${config}.$(($i +1)) +# fi +# done +# mv ${config} ${config}.0 +# fi +#fi # Rotate old configuration -if [ "$1" = "reconfigure" ] ; then - config="/etc/dolibarr/lighttpd.conf" - for i in $(seq 8 -1 0) ; do - if [ -f ${config}.$i ] ; then - mv ${config}.$i ${config}.$(($i +1)) - fi - done - mv ${config} ${config}.0 -fi +#if [ "$1" = "reconfigure" ] ; then +# config="/etc/dolibarr/lighttpd.conf" +# if [ -f $config ] ; then +# for i in $(seq 8 -1 0) ; do +# if [ -f ${config}.$i ] ; then +# mv ${config}.$i ${config}.$(($i +1)) +# fi +# done +# mv ${config} ${config}.0 +# fi +#fi db_capb backup @@ -39,8 +43,9 @@ db_capb backup db_title "dolibarr" || true -# Ask for web server type. -#db_input critical "dolibarr/webserver" || true +# Ask if we must delete database +echo "Ask for web server to setup" +db_input critical dolibarr/reconfigure-webserver || true if db_go ; then okcancel="1" diff --git a/build/deb/postinst b/build/deb/postinst index 9f103d8876d..e0bba1be4da 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -20,7 +20,7 @@ lighttpd_install() { if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then if which lighty-enable-mod >/dev/null 2>&1 ; then echo "Add link for Lighttpd config file" - ln -s /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf + ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf # We enabled it lighty-enable-mod dolibarr fastcgi-php else @@ -33,7 +33,7 @@ apache_install() { webserver=$1 if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then echo "Add link for Apache config file" - ln -s /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf + ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf fi } @@ -92,14 +92,6 @@ case "$1" in fi - # Reconfigure web server - db_reset dolibarr/reconfigure-webserver - - # Ask if we must delete database - echo "Ask for web server to setup" - db_input critical dolibarr/reconfigure-webserver || true - db_go || true - db_get dolibarr/reconfigure-webserver webservers="$RET" diff --git a/build/deb/postrm b/build/deb/postrm index dd05ee90379..27ce3777b7e 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -65,10 +65,12 @@ case "$1" in # Call when we upgrade upgrade) + echo "postrm upgrade" ;; # Call when we uninstall remove) + echo "postrm remove" rm -f $lockfile # Reconfigure web server @@ -98,7 +100,7 @@ case "$1" in # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers" + echo "postrm purge" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" From 51ca95ca88bfbc04bed9fe5332e5bbdb1c61be1f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Aug 2011 19:10:27 +0000 Subject: [PATCH 085/118] Work on debian package From 9842fc6fbb7c67ea3a56a6538e2f3c9ed404a3ed Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Aug 2011 22:03:50 +0000 Subject: [PATCH 086/118] Fix: Restore feature to have code inside language list --- htdocs/core/class/translate.class.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index bf30794f153..4496c18ff1f 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -23,7 +23,7 @@ * \brief File for Tanslate class * \author Eric Seigne * \author Laurent Destailleur - * \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $ + * \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $ */ @@ -512,9 +512,10 @@ class Translate { * Return list of all available languages * @param langdir Directory to scan * @param maxlength Max length for each value in combo box (will be truncated) + * @param usecode Show code instead of country name for language variant * @return array List of languages */ - function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0) + function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0) { global $conf; @@ -527,7 +528,7 @@ class Translate { { $this->load("languages"); - if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE) + if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE)) { $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength); } From 1634acf0d4ad377d9b418c72713f3ee01e0c16e2 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 2 Aug 2011 09:31:06 +0000 Subject: [PATCH 087/118] Trad: More accurate trad From a3abc2ab6962021c81a1136a03f7244ecf182d58 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 2 Aug 2011 12:44:20 +0000 Subject: [PATCH 088/118] bug #33926: Don't can edit contract lines --- htdocs/contrat/fiche.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 0cf91d64abc..b0145e14628 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -23,7 +23,7 @@ * \file htdocs/contrat/fiche.php * \ingroup contrat * \brief Page of a contract - * \version $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $ + * \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $ */ require ("../main.inc.php"); @@ -757,7 +757,7 @@ else $var=!$var; - if ($action != 'editline' || $_GET["rowid"] != $objp->rowid) + if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid) { print ''; // Libelle @@ -1286,5 +1286,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $'); +llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $'); ?> From 18d7615295a5cf96e703d47940d9b360f241d04f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 2 Aug 2011 21:53:58 +0000 Subject: [PATCH 089/118] Fix: Avoid errors into rpm packages From 2159d3f7449695f157a954d0dc119356ea544dad Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Jul 2011 18:34:45 +0000 Subject: [PATCH 090/118] Add barbaros info --- .../install/mysql/data/llx_10_c_regions.sql | 32 +++++++++---------- .../mysql/data/llx_20_c_departements.sql | 3 +- .../install/mysql/data/llx_c_currencies.sql | 5 +-- htdocs/install/mysql/data/llx_c_tva.sql | 5 +-- .../install/mysql/migration/3.0.0-3.1.0.sql | 12 ++----- .../mysql/tables/llx_c_departements.sql | 5 +-- htdocs/install/mysql/tables/llx_c_regions.sql | 5 +-- 7 files changed, 33 insertions(+), 34 deletions(-) diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 1f046a29bc4..1c43326d70f 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $ -- -- @@ -158,21 +158,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1); -- Regions Chile (id country=67) -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1); -- Regions San Salvador (id country=86) INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1); diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 9a109ab3fdc..e3963e8e68f 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $ -- -- @@ -566,6 +566,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1); +INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1); diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql index eeb2c376b85..ad7c175fcc4 100644 --- a/htdocs/install/mysql/data/llx_c_currencies.sql +++ b/htdocs/install/mysql/data/llx_c_currencies.sql @@ -17,9 +17,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_c_currencies.sql,v 1.8 2011/08/03 01:25:46 eldy Exp $ +-- $Id: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 788e9e82f39..056dbdbdb6e 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -18,9 +18,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_c_tva.sql,v 1.27 2011/08/03 01:25:44 eldy Exp $ +-- $Id: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $ -- -- 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 e32055ea452..aa6381d5967 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.84 2011/07/29 19:59:10 eldy Exp $ +-- $Id: 3.0.0-3.1.0.sql,v 1.82 2011/07/28 18:34:46 eldy Exp $ -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page @@ -25,10 +25,8 @@ 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 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_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_c_currencies ADD COLUMN symbole varchar(3) NOT NULL default ''; ALTER TABLE llx_commande_fournisseur MODIFY model_pdf varchar(255); @@ -131,9 +129,6 @@ 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; @@ -483,4 +478,3 @@ ALTER TABLE llx_don ADD phone_mobile varchar(24) after email; ALTER TABLE llx_don ADD phone varchar(24) after email; ALTER TABLE llx_user ADD civilite varchar(6) after entity; - diff --git a/htdocs/install/mysql/tables/llx_c_departements.sql b/htdocs/install/mysql/tables/llx_c_departements.sql index ea1f7543428..ab0ea5dc0c3 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.sql @@ -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: llx_c_departements.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id: llx_c_departements.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ -- ======================================================================== create table llx_c_departements diff --git a/htdocs/install/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql index 5ef6fb221e6..d9d0f2d1b0c 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.sql @@ -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: llx_c_regions.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id: llx_c_regions.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ -- ======================================================================== create table llx_c_regions From 55ba2a3359f02ed8969d0a137d991c941192b2ac Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Jul 2011 18:57:23 +0000 Subject: [PATCH 091/118] Doxygen --- htdocs/lib/ajax.lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/lib/ajax.lib.php b/htdocs/lib/ajax.lib.php index 55def736688..7db1908bc49 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ */ From c9edc510db57232f386752cff10960163dbc6f0e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Jul 2011 20:54:02 +0000 Subject: [PATCH 092/118] Fix: Theme --- htdocs/theme/auguria/style.css.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index edb62d728d5..78ca25e85a6 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $ + * \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language From 85aab8cbe1480f2adf85b5484679d31ababeee27 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Jul 2011 22:22:31 +0000 Subject: [PATCH 093/118] Fix: Add missing fields --- htdocs/install/mysql/migration/3.0.0-3.1.0.sql | 8 +++++--- htdocs/install/mysql/tables/llx_commande.sql | 5 +++-- htdocs/install/mysql/tables/llx_commande_fournisseur.sql | 5 +++-- 3 files changed, 11 insertions(+), 7 deletions(-) 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 aa6381d5967..cdc633ca281 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.82 2011/07/28 18:34:46 eldy Exp $ +-- $Id: 3.0.0-3.1.0.sql,v 1.83 2011/07/28 22:22:32 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); diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 731cf8fb0f4..9c6e2a065f8 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -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: llx_commande.sql,v 1.14 2011/08/03 01:25:34 eldy Exp $ +-- $Id: llx_commande.sql,v 1.13 2011/07/28 22:22:31 eldy Exp $ -- =================================================================== create table llx_commande diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index f1c8c7ac579..3ef51d6ae21 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -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: llx_commande_fournisseur.sql,v 1.8 2011/08/03 01:25:32 eldy Exp $ +-- $Id: llx_commande_fournisseur.sql,v 1.7 2011/07/28 22:22:31 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur From ff919c527a0771d0ed8e5b7cf4e4bce0d1904a11 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 23:24:38 +0000 Subject: [PATCH 094/118] Fix: Avoid errors into rpm packages --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/control.DEBIAN | 46 + build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 - build/deb/install | 1 - build/deb/po/fr.po | 22 +- build/deb/po/templates.pot | 20 +- build/deb/postinst | 100 +- build/deb/postrm | 119 +- build/deb/templates | 7 - build/makepack-dolibarr.pl | 36 +- dev/skeletons/modMyModule.class.php | 4 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 33 +- htdocs/admin/perms.php | 32 +- htdocs/boxes.php | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/tpl/validation1.tpl.php | 21 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/core/class/conf.class.php | 9 +- htdocs/core/class/cookie.class.php | 5 +- htdocs/core/class/html.form.class.php | 11 +- htdocs/core/class/interfaces.class.php | 5 +- htdocs/filefunc.inc.php | 7 +- htdocs/imports/import.php | 7 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 +++++++++-------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/index.php | 7 +- htdocs/install/check.php | 5 +- htdocs/install/default.css | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 32 +- .../mysql/data/llx_20_c_departements.sql | 3 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../install/mysql/migration/3.0.0-3.1.0.sql | 6 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/langs/es_ES/html/gpl.html | 330 ++++++ htdocs/langs/nl_BE/html/gpl.txt | 340 ++++++ htdocs/langs/nl_NL/html/gpl.txt | 339 ++++++ htdocs/lib/admin.lib.php | 77 +- htdocs/lib/ajax.lib.php | 5 +- htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 6 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- htdocs/societe/soc.php | 10 +- htdocs/theme/auguria/style.css.php | 5 +- .../smartphone/theme/default/default.css.php | 5 +- htdocs/user/group/perms.php | 34 +- htdocs/user/perms.php | 32 +- 337 files changed, 2690 insertions(+), 1579 deletions(-) create mode 100755 build/deb/control.DEBIAN create mode 100644 htdocs/langs/es_ES/html/gpl.html create mode 100644 htdocs/langs/nl_BE/html/gpl.txt create mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index d73d7a99219..edb46ffd5a3 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,13 +22,12 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build binary only package +# dpkg -b To build package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# dpkg-reconfigure -plow package Reconfigure package +# # dpkg -L packagename List content of installed package -# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index 3382966714b..b035f18ae1d 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 + -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN new file mode 100755 index 00000000000..7c66775bdf1 --- /dev/null +++ b/build/deb/control.DEBIAN @@ -0,0 +1,46 @@ +Package: dolibarr +Version: __VERSION__ +Architecture: all +Maintainer: Laurent Destailleur +Installed-Size: 61200 +Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Section: web +Priority: optional +Homepage: http://www.dolibarr.org +Description: Easy to use web based ERP & CRM software + Dolibarr ERP & CRM is an easy to use open source/free software for small + and medium companies, foundations or freelances. It includes different + features for Enterprise Resource Planning (ERP) and Customer Relationship + Management (CRM) but also for different other activities. + It's a web software you can install as a standalone program or on any web + hosting provider to use it from anywhere with any web browser. + Dolibarr was designed to provide only features you need and be easy to use. + . + Only features you need are visible, depending on which module were activated. + Most common used modules are: + . + Customers, Suppliers or Prospects directory, + Contacts directory, + Orders management, + Commercial proposals management, + Invoices management, + Products and services catalog, + Stock management, + Foundations members management, + Bank accounts management, + Point of Sale, + Payments management, + Commercial actions management, + Contracts management, + Standing orders management, + Shipping management, + Donations management, + Bookmarks management, + Mass Emailings, + Reports, + Wizards to export and import data, + LDAP connectivity, + PDF exports, + And a lot of more modules... + . + You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index e28258d8dbc..91f0705c001 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,16 +4,10 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper (>= 7), po-debconf +Build-Depends: debhelper, po-debconf Package: dolibarr -Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, - php5-mysql | php5-mysqli, - php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, - ${misc:Depends}, xdg-utils, - mysql-server, perl -Recommends: apache2 | lighttpd | httpd, mysql-client -Suggests: www-browser +Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl Architecture: all Section: web Priority: optional diff --git a/build/deb/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 b/build/deb/install index 2928d378abc..4d41fd52c65 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,5 +1,4 @@ etc/dolibarr/apache.conf -etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 3bbe762283a..13b8030ed0d 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:49+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,26 +25,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Seveur web à reconfigurer automatiquement:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"dolibarr." -msgstr "" -"Selectionnez le serveur web à configurer automatiquement pour utiliser " -"dolibarr." - # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -52,7 +36,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index d65e5d8b7f6..32c92a97cc4 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,29 +17,15 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"dolibarr." -msgstr "" - #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index e0bba1be4da..ca5fd1645dd 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,5 +1,7 @@ #!/bin/sh # postinst script for dolibarr +# +# see: dh_installdeb(1) set -e @@ -14,31 +16,6 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - - -lighttpd_install() { - if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - if which lighty-enable-mod >/dev/null 2>&1 ; then - echo "Add link for Lighttpd config file" - ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf - # We enabled it - lighty-enable-mod dolibarr fastcgi-php - else - echo "Lighttpd not installed, skipping" - fi - fi -} - -apache_install() { - webserver=$1 - if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Add link for Apache config file" - ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - . /usr/share/debconf/confmodule db_version 2.0 @@ -50,6 +27,8 @@ echo Run the dolibarr postinst script # Define vars docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" installconfig="/etc/dolibarr/install.forced.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php" @@ -65,6 +44,10 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir + # Copy apache.conf file into target directory + #mkdir -p /etc/dolibarr + #cp -p $apachefileorig $apacheconfig + # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -91,15 +74,21 @@ case "$1" in chmod -R 660 $config fi - - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - + # Get the web server type (use db_get for interactive mode). + #db_reset "dolibarr/webserver" + #db_get "dolibarr/webserver" # Read value for webserver. + #webserver="$RET" + + case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; + esac + # Set up web server. - for webserver in $webservers ; do - webserver=${webserver%,} - echo Complete config of server $webserver + for server in $webservers ; do + echo Complete config of server $server # Detect webuser and webgroup webuser= @@ -117,31 +106,26 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config + + # Add link to config file + echo Setup web server $server to add dolibarr config file + ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf + done - # Restart web server. - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_install - else - apache_install $webserver - fi - # Reload webserver in any case, configuration might have changed - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $webserver reload 3>/dev/null || true - else - echo Restart web server $server using $server reload - /etc/init.d/$webserver reload 3>/dev/null || true - fi - fi + # Restart servers + servers="apache2-ssl apache2 mysql" + # Another way to restart + for server in $servers ; do + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $server reload || true + else + echo Restart web server $server using $server reload + /etc/init.d/$server reload || true + fi done - echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -152,13 +136,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument $1" >&2 + echo "postinst called with unknown argument \`$1'" >&2 exit 0 ;; esac -#DEBHELPER# - db_stop +#DEBHELPER# + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 27ce3777b7e..9eae81b022b 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,36 +17,7 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - -lighttpd_remove() { - if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - echo "Remove link for Lighttpd config file" - rm -f /etc/lighttpd/conf-available/50-dolibarr.conf - if which lighty-enable-mod >/dev/null 2>&1 ; then - lighty-disable-mod dolibarr - else - echo "Lighttpd not installed, skipping" - fi - # See bug #448682 - if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then - echo 'Manually deleting lighttpd/dolibarr configuration link' - rm /etc/lighttpd/conf-enabled/50-dolibarr.conf - fi - fi -} - -apache_remove() { - if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Remove link for Apache config file" - rm -f /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule -fi +. /usr/share/debconf/confmodule db_version 2.0 @@ -55,62 +26,63 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" +export webserver="" +# Allows us to loop and substitute in one pass +case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; +esac + case "$1" in # Call when we upgrade upgrade) - echo "postrm upgrade" ;; # Call when we uninstall remove) - echo "postrm remove" rm -f $lockfile - # Reconfigure web server - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - - # Restart web servers - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_remove - else - apache_remove $webserver - fi - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $webserver reload 3>/dev/null || true - else - /etc/init.d/$webserver reload 3>/dev/null || true - fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete link $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge" + echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical dolibarr/postrm || true + db_input critical "dolibarr/postrm" || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get dolibarr/postrm + db_get "dolibarr/postrm" set -e if [ "$RET" = "true" ] ; then @@ -213,12 +185,41 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete file $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" + fi + done + rm -rf /etc/dolibarr + # Restart servers + for server in $restart ; do + # We disable blocking errors + set +e + echo "Restart server $server if exists" + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $server reload || true + else + /etc/init.d/$server reload || true + fi + # We restore blocking errors + set -e + done + # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset dolibarr/reconfigure-webserver - db_reset dolibarr/postrm + db_reset "dolibarr/postrm" set -e #db_purge @@ -228,7 +229,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument $1" >&2 + echo "postrm called with unknown argument \`$1'" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index b96325a4e64..5c06afd8ccd 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,10 +1,3 @@ -Template: dolibarr/reconfigure-webserver -Type: multiselect -Choices: apache2, lighttpd -_Description: Web server to reconfigure automatically: - Please choose the web server that should be automatically configured - to run dolibarr. - Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 20c5ba415e9..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.129 2011/08/01 18:22:26 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -318,9 +318,6 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; } # Build package for each target @@ -572,8 +569,6 @@ if ($nboftargetok) { if ($target eq 'DEB') { - $olddir=getcwd(); - $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -676,22 +671,19 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache and lighttpd conf files + # Apache conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; + + # Dolibarr conf files + # TODO # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -737,15 +729,17 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - # Creation of binary package (to build without sources) - #print "Go to directory $BUILDROOT\n"; - #chdir("$BUILDROOT"); + print "Go to directory $BUILDROOT\n"; + $olddir=getcwd(); + chdir("$BUILDROOT"); + + # Creation of binary package (to build without sources) #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Prepare source package + # Creation of source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -757,7 +751,6 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; - $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -773,9 +766,6 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; - - # Creation of source package - print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; 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/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/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/css/style.css b/htdocs/cashdesk/css/style.css index 698cceb4966..c79d46fbeb5 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,10 +11,11 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ +/* \version $Id$ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index 2d89cfd2388..f91946e11c0 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.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. */ // Instanciation et initialisation de l'objet xmlhttprequest 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/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 96de90124f9..259dc4dbce5 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -47,7 +48,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -66,7 +67,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -77,17 +78,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 0efb704828f..e05eaa66ecf 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ + * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ */ require('../main.inc.php'); @@ -1031,5 +1032,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); +llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 5da397b4183..d2f2a7aae7e 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ + * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ */ require('../main.inc.php'); @@ -672,5 +673,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); +llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index c5664164e74..e6559c2ae2e 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -16,7 +16,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -24,7 +25,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ + * \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $ */ @@ -144,13 +145,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; + $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/'; + $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php index c21450bb8cb..07fed567b48 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,13 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index e24b3c7c717..cb4a0f7a5cf 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -23,14 +23,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.193 2011/07/31 23:45:14 eldy Exp $ + * \version $Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $ */ @@ -160,10 +161,8 @@ class Form $htmltext=str_replace("\n","",$htmltext); $htmltext=str_replace('"',""",$htmltext); - if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip - else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag - if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip - else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip + $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag $s=""; if (empty($notabs)) $s.=''; diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 2ca2f82789e..8deeda0fb57 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/interfaces.class.php * \ingroup core * \brief Fichier de la classe de gestion des triggers - * \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $ */ diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 13a97bf54b3..3148174f5af 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,15 +20,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -65,7 +64,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 97d4d8252d3..c03b55d2347 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ + * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ */ require_once("../main.inc.php"); @@ -1668,7 +1669,7 @@ print '
                              '; $db->close(); -llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); +llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); /* diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 6f6c7ed2a1b..257b95e4e3c 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -64,7 +65,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.31 $'); + $ver=explode(' ','$Revision: 1.30 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 446606ef055..127eb16e389 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -63,7 +64,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
                              This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.28 $'); + $ver=explode(' ','$Revision: 1.27 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 46fa4c9ccc4..9c90d1fcc94 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,7 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program. If not, see . +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* or see http://www.gnu.org/ */ /** @@ -20,7 +22,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -59,7 +61,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
                              This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.14 $'); + $ver=explode(' ','$Revision$'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index 7055bef4b69..ec7e1af07c6 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ + * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/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/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index 067e831b0b4..b1e3f5a2638 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,503 +1,504 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index e5f0ff4c0e5..b1e3f5a2638 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,7 +484,8 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/index.php b/htdocs/index.php index 5998094d362..f027e94a35a 100644 --- a/htdocs/index.php +++ b/htdocs/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/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -574,7 +573,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); +llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 3724ef23d95..9b19d9793fc 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 1d2084e7c7f..9978c8f437a 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/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.24 2011/08/03 01:32:42 eldy Exp $ + * $Id$ */ body { diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 20ef1080e85..737e16cc10c 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 5d7fca530f2..c9713870c22 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index d7df4ac6929..e7b45a476f1 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 9a0dd0fcc43..62e0a4a90cf 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 0037190af06..50fa9904890 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ + * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 6d19b01e197..2e0fccb0051 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 3050d37833c..223a2eb6d92 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -75,10 +74,12 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +$lockfile = '../../install.lock'; +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; - +#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here +$lockfile = '../../install.lock'; if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -178,7 +179,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists('../../install.lock')) +if (file_exists($lockfile)) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
                              '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index c786f91346c..841136fff8b 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 275298588e2..9d08a56e41c 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,9 +17,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_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 1c43326d70f..1f046a29bc4 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ -- -- @@ -158,21 +158,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1); -- Regions Chile (id country=67) -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1); -- Regions San Salvador (id country=86) INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1); diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index e3963e8e68f..9a109ab3fdc 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ -- -- @@ -566,7 +566,6 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1); diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index da244f79951..56ceea3d807 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,9 +17,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_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index eee5dfa185a..3a248c2f49f 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,9 +18,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_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index e3922b97f65..dcbaf2faaf4 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,9 +17,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_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index b7f6c71c87e..1dd3cb59a62 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,9 +11,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_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index f3299990858..5e93e39d048 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,9 +17,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_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index 1f14cc8c142..e3ed8196d17 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,9 +17,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_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 5017ce0c60d..176e5c796e2 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,9 +17,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_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index f58db2b32a6..db630463dbf 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,9 +17,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_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index 079caa7dde4..c67d263853d 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,9 +17,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_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 4bb81528e74..07fa2abaa83 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,9 +18,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_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index 720413ac480..e29b3f306f5 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,9 +17,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_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index cb0b557b438..c7fa6b6dd1f 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.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_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index a3a19cc2125..6a597996424 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,9 +17,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_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 1ec498e6bc2..78e174b9817 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,9 +17,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_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a17978bb0c..3a535a5098e 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,9 +17,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_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index 96d456312df..f6395abbfcd 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,9 +17,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_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 488b0a564eb..9c28f697f83 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,9 +17,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_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index d8701c52c01..988d9c26136 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,9 +17,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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- @@ -33,4 +34,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2fd47385a90..2d1a3c62a39 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,9 +17,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_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index da98640fd25..4238000eb14 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,9 +17,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_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 789ad16fce2..6e596be24e5 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,9 +17,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_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index 48b77951e1f..e2faed3cba3 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,9 +17,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_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index 59bd3d1ef00..cf7e9e96275 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,9 +17,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_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index cd2f27a5dca..655848a50ae 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.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: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql index cdc633ca281..e32055ea452 100755 --- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql +++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql @@ -1,5 +1,5 @@ -- --- $Id: 3.0.0-3.1.0.sql,v 1.83 2011/07/28 22:22:32 eldy Exp $ +-- $Id: 3.0.0-3.1.0.sql,v 1.84 2011/07/29 19:59:10 eldy Exp $ -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page @@ -131,6 +131,9 @@ ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_user FOR -- V4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_usergroup FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid); +-- V4.1 DELETE FROM llx_product_fournisseur where fk_product NOT IN (SELECT rowid from llx_product); +ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); + ALTER TABLE llx_commande ADD COLUMN ref_int varchar(30) AFTER ref_ext; ALTER TABLE llx_facture ADD COLUMN ref_int varchar(30) AFTER ref_ext; ALTER TABLE llx_societe ADD COLUMN ref_int varchar(60) AFTER ref_ext; @@ -480,3 +483,4 @@ ALTER TABLE llx_don ADD phone_mobile varchar(24) after email; ALTER TABLE llx_don ADD phone varchar(24) after email; ALTER TABLE llx_user ADD civilite varchar(6) after entity; + diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 42f86f1c447..968a131e2bb 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -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: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 685170362fd..6e6e960072b 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.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_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 921bc569980..02ff06ba9f1 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.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_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index d5902b539c7..f22262c9353 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.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_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index ddd3d734ff7..b2cdf08af5f 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.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_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 8c5c23bbe62..031bfb614e1 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -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: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index f7b876eed86..3aa9555979e 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -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: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 8d34e2a9c78..4703aa32ddd 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -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: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index ad6f448e3dc..69bf706ca68 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,9 +15,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_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 51d66c04584..9156b439833 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,9 +15,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_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index 7df7f21a3b9..db64e0cbf9c 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -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: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index 31676d7d6e2..a7efcbd0f6d 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -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: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index bc9d9ad0936..7e4fa074e71 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -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: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index 18eed730ab8..d23a1367f92 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index ade41da746e..2b2db5af657 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index 62a88236480..b5c9175202b 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 015a9e9b4c0..6ed1e00dd88 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index 296b49fc93f..d1279c21eb2 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 9cedf70e7ca..822a69bc4ec 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index 55718d8ffb5..aba765190ee 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.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_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index abc9baa2d8c..eded16c49fe 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -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: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index 3dd83585bcd..e39fbf71f12 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -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: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 217edcaddbb..3710a87470a 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -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: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index 5869f24d8bd..ad41449f288 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -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: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index 5db17f19069..f6301a24919 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index 5f66ff625f0..cd68a9cdb40 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index b0546729ef0..890c7597862 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.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_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index 4794113f8bd..d67cf7fe4b8 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -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: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5fc25f57339..5c06c73c69d 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 5746cce26aa..115bd310d70 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index ba1e56e2b94..d3c71cc4a70 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.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_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index de9c23e9c05..10c4cc2d853 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,10 +13,11 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, 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_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index cce9d04707b..09365976d78 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.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_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 93e8e3d99a7..463b1235094 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -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: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index b0f31fe7116..c81a2b3e830 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -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: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index cb2251cfaf6..821fe3e5c04 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -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: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 8bebcf13116..9380607010d 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index b30354cae19..e524d9c937a 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index b026a40d762..0b0b34390c4 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -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: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 39d21cee7b9..7b5fa661d7d 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -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: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index d1e6b216b4b..e2f225fe608 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.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_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 60af7723f30..66cd5111325 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -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: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index cb223ae5532..ebca12ab5da 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -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: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 415b8526793..3872bedd39d 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -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: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index 5c54695f608..bed4ad41dfc 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 93ef5d59770..23cd0f575ed 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index 7702a8cf21e..f46d2a56c33 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.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_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 46a35567e95..4669de108f4 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.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_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index c2c43a3a625..a6bb8ca70f7 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -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: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 547500d7f33..5637e5a987d 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -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: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index bf7ed18af80..884d8274cfd 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.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_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index d0dceaf0fe1..2b6dea6cbd3 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -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: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 192183be0c1..76aecebbb9a 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -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: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index d6d673962b9..665a210d74b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -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: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index c8deefef6d7..7fcd57e31eb 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -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: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index 757653f1fc2..e1cab3b3368 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -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: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f2fb7fda4d3..f97e458be6b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -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: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 7a228ec1572..165a8550331 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -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: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 120e27ae77d..6efa388ef81 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.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_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index a5e3fd8721b..c8824b2d04e 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.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_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 418e37a85b1..311183c87f4 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.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_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 1cc5dbfaf0e..2d00f620e02 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -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: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 84c72e0839b..02052920c8a 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -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: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 8cf0ec900f8..0f608cbc171 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.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_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 2eed307bc54..75b40946559 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.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_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index c977dd9dd21..76caf44356d 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 8307ca88eb6..861671e3607 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -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: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 9a7bda88c28..46504e8a1c4 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -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: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index 725ddbfeb90..dc284fc8cea 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -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: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index a1feeb33f8b..4f8736a3a14 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -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. -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -23,7 +24,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 1e141b7768a..85ea592d950 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -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: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 79d54faf623..9fad6cc333e 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -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: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index 97638937c74..d6bd27758b4 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -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: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 211af70a854..40759cdc50b 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.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_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 7c4c534451d..80e73c43399 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -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: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index f2330322a5f..4c466e0c02b 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -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: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 8e4492c28a9..46a39b3c9e7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -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: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 39be52cf374..60641bf1876 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -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: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index e93ce9b4354..cfe126b5adf 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.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_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index baa01289b96..7e12e06beb7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -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: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index bd19d25f1a5..83eb804c875 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -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: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index eb95b9fe66c..6236e113766 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -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: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index 2c95fde3255..cf5121c34f9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -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: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index d62011351c4..cabdcce3a80 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index a07ff049d61..ebaf9582414 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index 730bc11ac98..fa9a85aac1f 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -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: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index 6f129f2feec..ec8931763bf 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -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: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 172a2432ee1..7958b56f354 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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. -- --- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orphelins pour permettre mont�e de la cl� +-- Supprimme orphelins pour permettre monte de la cl -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index c13c0aa6019..3f848c9ffe2 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index f0c65456e5c..df6d49827f6 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index be4e60a9a97..9bb45f9d326 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -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: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 23cfd068495..91914ab66c7 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -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: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b18165255..d1b39863cab 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -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: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index 19ec675f973..e964fbc2f5e 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -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: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a53a24d9a66..a747c714fb3 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.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_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 46639ca7c1e..16ecb365d6c 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.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_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index d1ba0645e05..bfce896eb19 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.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_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index b7fc52403af..51234007ee1 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.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_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index 4187f526393..eead2907fa2 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,9 +15,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_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 7b74d8b506d..1c757fa6c86 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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. -- --- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orhpelins pour permettre mont�e de la cl� +-- Supprimme orhpelins pour permettre monte de la cl -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index f1f4a75b604..79b52ba399c 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -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: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 39b89773316..3757e4522bf 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -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: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index 98b29b1f715..f5987250001 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -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: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 0eb566317d0..9c4a5e340ab 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 3fb9f7d6d2d..906d0a3e2f4 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index ba595100b5f..20bb329ff0e 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index b71d2697b85..2063a310fb8 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index 61d63046fac..a99b42859c7 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -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: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index 0e20201f4cb..f0e0a065089 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.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_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 154f0b51006..06af8a78575 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.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_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1dc4941012a..1c5d5c30173 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -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: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index a208aa5fff0..e43f4cb118c 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -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: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index f60029ee290..e4eb41f3bb4 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.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_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 2833920b746..463675b10b7 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -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: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index 7987ca819c1..fc998bd6edb 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.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_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index e027d471e23..1e9b0495d34 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -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: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ +-- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index 8b279dc578b..b899c4303e1 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.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_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 684c5aa5a7c..5d6d86617e6 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -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: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index cdccf3eb6ec..6de1b23eb64 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.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_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index fee45753759..04491e0878c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -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: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 9401f679071..575930a728c 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -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: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 757e8d2b447..46b769b8afc 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.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_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index d0118ebdc6c..e1b82141ea1 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 57d92bc8ce9..19824c860de 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 6f2ddcf56b9..455916a3010 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.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_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 6cf13137710..94e726796c5 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.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_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index cee3ace0ec3..8dbbb572f29 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -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: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 34d0bbac03b..923c2441987 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.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_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index ef97e48a251..88cf83a3cc3 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -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: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index b674a0cf11d..68e21d26061 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -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: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index 5e3620cba87..f289b9cb514 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -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: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index bd3c0c7d780..a2e54d34770 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -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: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index 1524eb7a77b..dbeec277f88 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -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: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index 75a4ce8fd06..e3e5900fb74 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.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_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index eafe6bd31e1..0669065b7d3 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -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: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index 6a06c0c70b5..dcca0174817 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -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: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index d4aa4b26d99..99cf1edd744 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.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_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index b55d734674f..415b44c6a35 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -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: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index 22a5b9d5c52..ba8b40b3c0a 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -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: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 5edbea4808d..40e131fefdf 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,9 +15,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_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index 5313952606a..bc11ca42c8f 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -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: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index c210f906b9b..8d4a4ecdcbf 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,9 +15,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_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index 29598bb4963..f43ab1e746a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.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_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index cfaad1061df..a52d3ed4a8b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -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: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 521d666742d..4e9f0d1da0e 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -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: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index 29af17f7c08..c9891219f4f 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,9 +15,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_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 917d6fc5cdf..6b8f7176dee 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -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: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 87245438b4d..399dd175311 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,9 +15,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_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index 373267c8921..c06074d4709 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,9 +15,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_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index b67427b9de8..1e3f21d0eb7 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.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_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 8f00ee95200..08450aa204f 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -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: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index edc76a392b0..9b0104ccfe5 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.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_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 302248ae299..0782e089170 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -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: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 9c741080a27..68b6cd9a315 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 4dd0ae15ad4..177be65fb88 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index ffc0666074d..d573c90eb18 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -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: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index 96f122e59cd..e0b2c2494ad 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -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: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 4beccac04b8..92000240642 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -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: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 484cebf6a2a..6240a2ed5c0 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -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: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index a56201f7dba..e2c4be38a5f 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -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: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 84f6077e5ba..51e133a86dc 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.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_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index 46685416239..aab9c69c1a7 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -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: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index 1d41d1ab59e..dc9732c0719 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -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: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index d6dd854a240..663adaffe60 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -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: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 0b7d6a61f56..73dc6489461 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -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: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index c1ee00edd07..0b42446740b 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.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_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index d694d696801..7d728850185 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -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: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index 925ca9eee81..d062249c3b8 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f67337de388..f33c92ea7fe 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 8c8454fbc28..92f21a35f28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.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_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index 6c673570cfc..e62275df23d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -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: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 9c05ed97a8d..29ad3853f90 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Oc�bo +-- Copyright (C) 2005 Marc Barilley / Ocbo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -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: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b127b194fa5..b9ba378d81f 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -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: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 5c8ea94ed09..8771b0ddda8 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.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_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 94ba92d4856..8bb011f7280 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.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_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 4017ae32682..1aba5d286d1 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -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: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index 2c77ae3447c..e0c4fd61701 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -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: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 52c0a3e2a03..1e721e86788 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.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_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index 439b2a68098..d4ea3ad5535 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.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_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index f01b7d02e8e..6f8d6a8cf97 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -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: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index bd1e805aed2..854ec6e826e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.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_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index bfc2162ceca..f1e90520593 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.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_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 784e3d37507..15d3bda5ba2 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -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: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 029bc528b6e..66a61851cae 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,9 +15,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_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 9c066c54436..195d2464738 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.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_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index f4e38524d25..44a301a2db7 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -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: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index f03d92ce651..237b5c23030 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.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_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 2c9c2d929db..3bec7551161 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index d9e9ecd43a7..45845593162 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 01cabfec865..672374961d5 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -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: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index 696cf49c337..d8d9443595d 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -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: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index 170bd56f390..f21fed4d1af 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -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: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index 5a3d71b489a..a501b4db4b6 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -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: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index d29449c2503..41a91a9aa5f 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.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_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index 86f114d395b..e12dbc6fb12 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -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: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index ce320558709..1a83bee6508 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -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: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 76f76ff08ed..93a28593f8e 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -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: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index 133687c7466..ec2bb01863b 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -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: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 6ccd3aa39fb..552a985abd4 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -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: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index e24a8918c5b..63b28ac8410 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -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: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index 26e451271cb..e7ccde53858 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -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: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index 40b07d29305..a1619df5cb5 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -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: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index e21669e63d7..309c60b660f 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.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_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index d094512d975..c92472f7af5 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -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: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index a75fb9aa76d..3fb70995900 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,9 +15,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_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ +-- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index a0d88737e3f..e7fc66a0ed6 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.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_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 9e28a37d6bb..57b252ed2ea 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -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: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index 376447586c9..b8453ea821c 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.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_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index e7528a03f28..00268974476 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -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: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 4f994cf57aa..16bf4dea7f0 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.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_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index 1a7fdfd755f..eff6387abee 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,9 +15,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_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index a618e3d8790..f53599483a4 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -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: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index 902f2b4fd5f..b9643f019c3 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.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_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index 1f5500e2eb1..db4cdd2581c 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -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: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index c7d84e27326..6bf45f749f5 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 523eb3b37e0..7db41de673c 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index bf057b4ad75..8dc4636c87e 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -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: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index ade6a40a80d..d500fc1b7cb 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.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_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index bca670bbb98..a515ba541bf 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -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: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index 7481589df00..b742b82dafc 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -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: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index 4adaa1a56ff..fff909a0ec8 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -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: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index 16631c76b76..fb65e9b7e84 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -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: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 3df14473a7e..332b1305d38 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.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_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index c3958313ea3..ca4206eb6fc 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -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: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 910d2ab2072..68e1d4f20e9 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -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: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 5c7f2e9a59c..8714e7e4a07 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -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: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index cbaadb10091..7d3b0eecd98 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.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_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index e88665b5a34..8bdd7193d1a 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -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: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 86916c216a2..367d45e8525 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -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: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 23065b261c8..28b28aeb762 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -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: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index 3f58eaf698b..d78db14c30b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -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: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 18924ff6ac5..68e46fd120d 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.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_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 8056a150fc3..6acb2db4585 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.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_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 1b5ea5516d4..838f502bfdb 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -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: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index e61985c7dd1..f21099e9c5e 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -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: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index 7bf81b7fbe9..f771be5ef5a 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.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_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 1fb0d708dfa..0033bca36bc 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.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_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 6df43634ec4..8037c9cd7e5 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -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: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 7b6cbd91645..99234b6660f 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index 810781ed6d9..dca8e80f856 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index 2e89f083575..f3a58aa1433 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.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_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index fd656c736ef..98c56c37567 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -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: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 87f6416c6c5..100d9fe82b0 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -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: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- ============================================================================ CREATE LANGUAGE plpgsql; diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html new file mode 100644 index 00000000000..38e0f007a15 --- /dev/null +++ b/htdocs/langs/es_ES/html/gpl.html @@ -0,0 +1,330 @@ + + + + + + + + +H. Licencia Pública GNU + + + + + + + + + + + + + +

                              Licencia Pública GNU

                              + + + + +
                              + +GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 + +
                              + +

                              Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, + MA 02139, USA.

                              +

                              Está permitido, a cualquier persona, copiar y distribuir copias tal cual de + este documento de licencia, sin la introducción de cualquier cambio. +

                              + +
                              +

                              Introducción

                              +

                              Las licencias de muchos softwares se desarrollan para asegurar la libertad + de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, + al contrario, pretende garantizar la libertad de compartir y alterar softwares + de libre distribución - volviéndolos de libre distribución también para cualquier + de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares + de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla + (algunos softwares de la FSF son cubiertos por la GNU Library General Public + License).

                              +

                              Cuando nos referimos a softwares de libre distribución, nos referimos a la + libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar + la libertad de distribución de copias de softwares de libre distribución (y + cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos + fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se + hacen algunas restricciones, para asegurar los derechos de los programadores, + prohibiendo a todas las personas su negación o la solicitación de su abdicación. + Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución + o modificación del software.

                              +

                              Por ejemplo, al distribuirse copias de determinado programa, por una tasa + determinada o gratuitamente, se debe informar sobre todos los derechos incidentes + sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia + Pública General GNU.

                              +

                              La protección de los derechos envuelve dos pasos: (1) copyright del software + y (2) licencia que da permiso legal para copia, distribución y/o modificación + del softwares.

                              +

                              Aún para la protección de la FSF y del autor es importante que todos entiendan + que no hay garantías para softwares de libre distribución. Si software se modifica + por alguien y lo pasa adelante, este software no más reflejará el trabajo original + del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                              +

                              Finalmente, cualquier programa de libre distribución está constantemente amenazado + por las patentes de softwares. Buscamos evitar el peligro de que distribuidores + de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. + Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación + de patente se debe hacer permitiendo el uso por cualquier individuo, sin la + necesidad de licencia de uso.

                              +

                              Los términos y condiciones precisas para copia, distribución y modificación + siguen abajo:

                              +
                              +

                              Licencia Pública General GNU

                              +

                              TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN +

                              + +
                                + +

                              1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga + un aviso colocado por el detentor de los derechos de autor diciendo que aquel + podrá ser distribuido en las condiciones de la Licencia Pública General. El + Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado + en un Programa y significa tanto el propio Programa, como cualquier de los + trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, + un trabajo que contenga el Programa o una parte de este, en su forma original + o con modificaciones o traducido para una otra lengua (la traducción está + incluida sin limitaciones en el término ``modificación'').

                                +

                                Actividades distintas de copia, distribución y modificación no están cubiertas + por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa + no está restringido y la salida del Programa está cubierta solamente en + el caso de que su contenido contenga trabajos basados en el Programa (independientemente + de que hayan sido creados por la ejecución del Programa). Si esto es así, + depende de las funciones ejecutadas por el Programa.

                                2. + +

                              2. El código fuente del Programa, de la forma como fue recibido, puede ser + copiado y distribuido, en cualquier media, desde que sea providenciado un + aviso adecuado sobre los copyrights y la negación de garantías, y todos los + avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, + estén inalterados y que cualquier producto oriundo del Programa esté acompañado + de esta Licencia Pública General.

                                +

                                Está permitido el cobro de tasas por el acto físico de transferencia o + grabación de copias, y pueden ser dadas garantías y soporte en cambio del + cobro de valores.

                                3. + + +
                              3. +

                                Se puede modificar la copia o copias del Programa de cualquier forma que + se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir + tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                                + +
                                  +

                                1. Debe existir un aviso destacado de que los datos originales fueron alterados + en los archivos y las fechas de los cambios;

                                  2. + +

                                2. Debe existir un aviso de que el trabajo distribuido o publicado es, + de forma total o parcial, derivado del Programa o de alguna parte suya, + y que puede ser licenciado totalmente sin costes para terceros bajo los + términos de esta Licencia.

                                  3. + +

                                3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, + en el inicio de tu ejecución, presentar la información de copyright y + de ausencia de garantías (o de que la garantía es de responsabilidad de + terceros), y que los usuarios pueden redistribuir el programa bajo estas + condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                                  4. +
                                + + Estos requisitos se aplican a trabajos de modificación en general. Si + algunas secciones identificables no sean derivadas del Programa, y pueden + ser consideradas como partes independientes, entonces esta Licencia y sus + Términos no se aplican a aquellas secciones cuando distribuidas separadamente. + Pero al distribuir aquellas secciones como parte de un trabajo basado en + el Programa, la distribución, como un todo, debe contener los términos de + esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no + a cada una de las partes independientemente de quem los tenga desarrollado. + Más que tener intención de contestar los derechos sobre el trabajo desarrollado + por alguien, esta sección objetiva propiciar la correcta distribución de + trabajos derivados del Programa. + Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado + en él ni a un trabajo basado en él, a un volumen de almacenaje o media de + distribución no obliga la utilización de esta Licencia y de sus términos + al trabajo. +
                                4. + + +
                              4. +

                                Están permitidas, la copia y la distribución, del Programa (o un trabajo + basado en éste) en la forma de código objeto o ejecutable de acuerdo con los + términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                                + +
                                  +

                                1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos + en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada + para manejo de softwares o

                                  +
                                  2. +

                                2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, + de poner a disposición a terceros, por un coste no superior al coste del + medio físico de almacenaje, una copia completa de los códigos fuente en + medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                                  +
                                  3. +

                                3. Esté acompañada con la misma información recibida en relación con la + oferta de la distribución del código fuente correspondiente (esta alternativa + solamente está permitida para distribuciones no comerciales y solamente + si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, + de acuerdo con la sección 2 arriba).

                                  +
                                  4. +
                                + El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones + en aquel trabajo. Cuando se habla en códigos fuentes completos significa + hablar de todos los fuentes de todos los módulos, además de las definiciones + de interfaces asociadas, archivos, scripts utilizados en la compilación + y instalación del ejecutable. Como una excepción excepcional, el código + fuente distribuido podrá no incluir algunos componentes que no se encuentren + en su escopo, como compilador, kernel, etc... para el SO donde el trabajo + sea ejecutado. + Si la distribución del ejecutable o objeto se hace, a través de acceso + a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente + de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos + con los objetos simultáneamente +
                                5. + +
                              5. +

                                No está permitida la copia, modificación, sublicenciamiento o distribución + del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier + tentativa de copia, modificación, sublicenciamiento o distribución del Programa + está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. + Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, + no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas + de esta Licencia.

                                6. +
                              6. +

                                No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá + documento o contrato que garantice permiso de modificación o distribución + del Programa o sus trabajos derivados. Estas acciones están prohibidas por + ley, en el caso de que no se acepten las condiciones de esta Licencia. La + modificación o distribución del Programa, o cualquier trabajo basado en éste, + implica en la aceptación de esta Licencia y de todos los términos de ésta + para copia, distribución o modificación del Programa o trabajos basados en + éste.

                                7. +
                              7. +

                                Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), + el recipiente automáticamente recibe una licencia del detentor original de + los derechos de copia, distribución o modificación del Programa objeto de + estos términos y condiciones. No pueden ser impuestas otras restricciones + en los recipientes.

                                8. + +
                              8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes + o derechos de autor, se impongan restricciones, que contradigan esta Licencia, + estos no exentan de su aplicación. Si no es posible distribuir el Programa + de forma a garantizar simultáneamente las obligaciones de esta Licencia y + otras que sean necesarias, entonces el Programa no podrá ser distribuido. +

                                Si esta Sección se considera, inválida por cualquier motivo particular + o general, su resultado implicará en la invalidación general de esta licencia + en la copia, modificación, sublicenciamiento o distribución del Programa + o trabajos basados en éste.

                                +

                                El propósito de esta sección no es, de forma alguna, incitar a quien quiera + que sea a infringir derechos reclamados en cuestiones válidas y procedentes, + y si proteger las premisas del sistema de libre distribución de software. + Muchas personas tienen hecho contribuciones generosas al sistema, en la + forma de programas, y es necesario garantizar la consistencia y credibilidad + del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución + de los softwares.

                                +

                                Esta sección pretende hacer claro los motivos que crearan las demás cláusulas + de estas Licencia.

                                9. + +
                              9. +

                                Si la distribución del Programa, dentro de los términos de esta Licencia, + tiene restricciones en algún País, por patentes o derechos de autor, el detentor + original de los derechos de autor del Programa bajo esta Licencia puede adicionar + explícitamente limitaciones geográficas de distribución, excluyendo aquellos + Países, haciendo con que la distribución solamente sea posible en los Países + no excluidos.

                                10. + +
                              10. +

                                La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) + puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública + General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos + objetivos y el espirito de la presente versión, pudiendo variar en detalles + referentes a nuevas situaciones encontradas.

                                +

                                A cada versión se da un número distinto. Si el Programa especifica, un + número de versión determinado de esta Licencia, que tenga en su contenido + la expresión ``o versión más actualizada'', es posible optar por las condiciones + de aquella versión o de cualquier versión más actualizada publicada por + la FSF.

                                11. + +
                              11. +

                                Si deseas incorporar parte del Programa en otros programas de libre distribución + de softwares hace falta autorización formal del autor. Para softwares que + la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde + que mantenido el espirito y objetivos originales de esta Licencia.

                                12. +
                              + +

                              AUSENCIA DE GARANTÍAS

                              +
                                +

                              1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER + GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE + EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS + DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, + LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD + Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS + CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y + REPAROS JUZGADOS NECESARIOS.

                                2. +

                              2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR + LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN + RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE + HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS + O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES + O DAÑOS.

                                +

                                FIN DE LA LICENCIA

                              + + +
                              +

                               

                              +

                              Apéndice

                              +

                              ¿Cómo aplicar estos términos a nuevos softwares?

                              +

                              Si has desarrollado un nuevo programa y deseas su amplia distribución para + el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, + que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                              +

                              Para esto basta con anexar este aviso al programa. Se recomienda indicar aún + en el inicio de cada archivo fuente la ausencia de garantías y una anotación + de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                              +

                              <nombre del programa y función> Copyright (C) 199X <Autor> +

                              +

                              Este programa es un software de libre distribución, que puede ser copiado + y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo + con la publicada por la Free Software Foundation, versión 2 de la licencia o + (a criterio del autor) cualquier versión posterior.

                              +

                              Este programa se distribuye en la expectativa de ser útil a sus usuarios, + pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE + ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General + 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. +

                              +

                              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:

                              +

                              Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares + NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software + de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. + Teclea 'muestra condic' para mayores detalles.

                              +

                              Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las + partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos + pueden variar o pueden ser accionados por otras interfaces como clic de ratón, + etc...

                              +

                               

                              +
                              +
                              + +www.conectiva.com + +
                              + + + + + diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt new file mode 100644 index 00000000000..3efbe1ccee7 --- /dev/null +++ b/htdocs/langs/nl_BE/html/gpl.txt @@ -0,0 +1,340 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +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 new file mode 100644 index 00000000000..778e2b02b41 --- /dev/null +++ b/htdocs/langs/nl_NL/html/gpl.txt @@ -0,0 +1,339 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van +deze licentie. \ No newline at end of file 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/ajax.lib.php b/htdocs/lib/ajax.lib.php index 7db1908bc49..55def736688 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ */ diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 49b67f9349a..1bdeb9562e6 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index eedd6a8841c..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/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index d6bf7267439..454073d9730 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 6e1e7b262f4..b5304ba4198 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index b0a7c2dece6..bda35165079 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.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/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ + * \version $Id$ */ if (session_id() == "") session_start(); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1da2adb751e..8bccf934120 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index a65f888ab11..efbd289cb3f 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ */ require("../main.inc.php"); @@ -1646,6 +1645,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); +llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 79601ea1031..8f373b577e8 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 8cf57ec0b64..724900dc500 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ + * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ */ require("../main.inc.php"); @@ -272,5 +271,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); +llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); ?> 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/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 78ca25e85a6..edb62d728d5 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $ + * \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index e78dff8f646..f93935ffb16 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.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/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ + * \version $Id$ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal 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 $'); ?> From 201e5002a50b86c33c7526ecf6c6f2e09351cafd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Jul 2011 22:48:58 +0000 Subject: [PATCH 095/118] Work on aps package --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/control.DEBIAN | 46 - build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 + build/deb/install | 1 + build/deb/po/fr.po | 22 +- build/deb/po/templates.pot | 20 +- build/deb/postinst | 100 +- build/deb/postrm | 119 +- build/deb/templates | 7 + build/makepack-dolibarr.pl | 36 +- dev/skeletons/modMyModule.class.php | 4 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 35 +- htdocs/admin/perms.php | 34 +- htdocs/boxes.php | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/tpl/validation1.tpl.php | 21 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/core/class/conf.class.php | 9 +- htdocs/core/class/cookie.class.php | 5 +- htdocs/core/class/html.form.class.php | 11 +- htdocs/core/class/interfaces.class.php | 5 +- htdocs/filefunc.inc.php | 7 +- htdocs/imports/import.php | 7 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 ++++++++--------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/index.php | 7 +- htdocs/install/check.php | 5 +- htdocs/install/default.css | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 32 +- .../mysql/data/llx_20_c_departements.sql | 3 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../install/mysql/migration/3.0.0-3.1.0.sql | 6 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/langs/es_ES/html/gpl.html | 330 ------ htdocs/langs/nl_BE/html/gpl.txt | 340 ------ htdocs/langs/nl_NL/html/gpl.txt | 339 ------ htdocs/lib/admin.lib.php | 77 +- htdocs/lib/ajax.lib.php | 5 +- htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 6 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- htdocs/societe/soc.php | 10 +- htdocs/theme/auguria/style.css.php | 5 +- .../smartphone/theme/default/default.css.php | 5 +- htdocs/user/group/perms.php | 34 +- htdocs/user/perms.php | 32 +- 337 files changed, 1581 insertions(+), 2692 deletions(-) delete mode 100755 build/deb/control.DEBIAN delete mode 100644 htdocs/langs/es_ES/html/gpl.html delete mode 100644 htdocs/langs/nl_BE/html/gpl.txt delete mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index edb46ffd5a3..d73d7a99219 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build package +# dpkg -b To build binary only package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# +# dpkg-reconfigure -plow package Reconfigure package # dpkg -L packagename List content of installed package +# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index b035f18ae1d..3382966714b 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 + -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN deleted file mode 100755 index 7c66775bdf1..00000000000 --- a/build/deb/control.DEBIAN +++ /dev/null @@ -1,46 +0,0 @@ -Package: dolibarr -Version: __VERSION__ -Architecture: all -Maintainer: Laurent Destailleur -Installed-Size: 61200 -Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl -Section: web -Priority: optional -Homepage: http://www.dolibarr.org -Description: Easy to use web based ERP & CRM software - Dolibarr ERP & CRM is an easy to use open source/free software for small - and medium companies, foundations or freelances. It includes different - features for Enterprise Resource Planning (ERP) and Customer Relationship - Management (CRM) but also for different other activities. - It's a web software you can install as a standalone program or on any web - hosting provider to use it from anywhere with any web browser. - Dolibarr was designed to provide only features you need and be easy to use. - . - Only features you need are visible, depending on which module were activated. - Most common used modules are: - . - Customers, Suppliers or Prospects directory, - Contacts directory, - Orders management, - Commercial proposals management, - Invoices management, - Products and services catalog, - Stock management, - Foundations members management, - Bank accounts management, - Point of Sale, - Payments management, - Commercial actions management, - Contracts management, - Standing orders management, - Shipping management, - Donations management, - Bookmarks management, - Mass Emailings, - Reports, - Wizards to export and import data, - LDAP connectivity, - PDF exports, - And a lot of more modules... - . - You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index 91f0705c001..e28258d8dbc 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,10 +4,16 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper, po-debconf +Build-Depends: debhelper (>= 7), po-debconf Package: dolibarr -Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, + php5-mysql | php5-mysqli, + php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, + ${misc:Depends}, xdg-utils, + mysql-server, perl +Recommends: apache2 | lighttpd | httpd, mysql-client +Suggests: www-browser Architecture: all Section: web Priority: optional diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index a48e5048dff..f4b471edf13 100644 --- a/build/deb/dolibarr.desktop +++ b/build/deb/dolibarr.desktop @@ -3,10 +3,14 @@ # It must be saved into directory /usr/share/applications Version=1.0 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM +Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations +Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/deb/install b/build/deb/install index 4d41fd52c65..2928d378abc 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,4 +1,5 @@ etc/dolibarr/apache.conf +etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 13b8030ed0d..3bbe762283a 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:49+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,10 +25,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "Seveur web à reconfigurer automatiquement:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" +"Selectionnez le serveur web à configurer automatiquement pour utiliser " +"dolibarr." + # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -36,7 +52,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index 32c92a97cc4..d65e5d8b7f6 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:52+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,15 +17,29 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: multiselect #. Description #: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:2001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index ca5fd1645dd..e0bba1be4da 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,7 +1,5 @@ #!/bin/sh # postinst script for dolibarr -# -# see: dh_installdeb(1) set -e @@ -16,6 +14,31 @@ set -e # for details, see /usr/share/doc/packaging-manual/ + + +lighttpd_install() { + if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + if which lighty-enable-mod >/dev/null 2>&1 ; then + echo "Add link for Lighttpd config file" + ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf + # We enabled it + lighty-enable-mod dolibarr fastcgi-php + else + echo "Lighttpd not installed, skipping" + fi + fi +} + +apache_install() { + webserver=$1 + if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Add link for Apache config file" + ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + . /usr/share/debconf/confmodule db_version 2.0 @@ -27,8 +50,6 @@ 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" @@ -44,10 +65,6 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir - # Copy apache.conf file into target directory - #mkdir -p /etc/dolibarr - #cp -p $apachefileorig $apacheconfig - # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -74,21 +91,15 @@ case "$1" in chmod -R 660 $config fi - # Get the web server type (use db_get for interactive mode). - #db_reset "dolibarr/webserver" - #db_get "dolibarr/webserver" # Read value for webserver. - #webserver="$RET" - - case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; - esac - + + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + # Set up web server. - for server in $webservers ; do - echo Complete config of server $server + for webserver in $webservers ; do + webserver=${webserver%,} + echo Complete config of server $webserver # Detect webuser and webgroup webuser= @@ -106,26 +117,31 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config - - # Add link to config file - echo Setup web server $server to add dolibarr config file - ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf - done - # Restart servers - servers="apache2-ssl apache2 mysql" - # Another way to restart - for server in $servers ; do - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $server reload || true - else - echo Restart web server $server using $server reload - /etc/init.d/$server reload || true - fi + # Restart web server. + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_install + else + apache_install $webserver + fi + # Reload webserver in any case, configuration might have changed + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $webserver reload 3>/dev/null || true + else + echo Restart web server $server using $server reload + /etc/init.d/$webserver reload 3>/dev/null || true + fi + fi done + echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -136,13 +152,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument $1" >&2 exit 0 ;; esac -db_stop - #DEBHELPER# +db_stop + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 9eae81b022b..27ce3777b7e 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,7 +17,36 @@ set -e # for details, see /usr/share/doc/packaging-manual/ -. /usr/share/debconf/confmodule + +lighttpd_remove() { + if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + echo "Remove link for Lighttpd config file" + rm -f /etc/lighttpd/conf-available/50-dolibarr.conf + if which lighty-enable-mod >/dev/null 2>&1 ; then + lighty-disable-mod dolibarr + else + echo "Lighttpd not installed, skipping" + fi + # See bug #448682 + if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then + echo 'Manually deleting lighttpd/dolibarr configuration link' + rm /etc/lighttpd/conf-enabled/50-dolibarr.conf + fi + fi +} + +apache_remove() { + if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Remove link for Apache config file" + rm -f /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi db_version 2.0 @@ -26,63 +55,62 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' -apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" -apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" -export webserver="" -# Allows us to loop and substitute in one pass -case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; -esac - case "$1" in # Call when we upgrade upgrade) + echo "postrm upgrade" ;; # Call when we uninstall remove) + echo "postrm remove" rm -f $lockfile - # 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" + # Reconfigure web server + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + + # Restart web servers + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_remove + else + apache_remove $webserver + fi + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload 3>/dev/null || true + else + /etc/init.d/$webserver reload 3>/dev/null || true + fi fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" + echo "postrm purge" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical "dolibarr/postrm" || true + db_input critical dolibarr/postrm || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get "dolibarr/postrm" + db_get dolibarr/postrm set -e if [ "$RET" = "true" ] ; then @@ -185,41 +213,12 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi - # Remove include files - export restart="" - for server in $webservers ; do - export conffile="/etc/$server/conf.d/dolibarr.conf" - if [ -f $conffile ] ; - then - echo Delete file $conffile - rm -f $conffile - status=purge - fi - - if [ "x$status" = "xpurge" ] ; - then restart="$restart $server" - fi - done - rm -rf /etc/dolibarr - # Restart servers - for server in $restart ; do - # We disable blocking errors - set +e - echo "Restart server $server if exists" - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $server reload || true - else - /etc/init.d/$server reload || true - fi - # We restore blocking errors - set -e - done - # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset "dolibarr/postrm" + db_reset dolibarr/reconfigure-webserver + db_reset dolibarr/postrm set -e #db_purge @@ -229,7 +228,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "postrm called with unknown argument $1" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index 5c06afd8ccd..b96325a4e64 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,3 +1,10 @@ +Template: dolibarr/reconfigure-webserver +Type: multiselect +Choices: apache2, lighttpd +_Description: Web server to reconfigure automatically: + Please choose the web server that should be automatically configured + to run dolibarr. + Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index d3c47e6b28d..20c5ba415e9 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.129 2011/08/01 18:22:26 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -318,6 +318,9 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; } # Build package for each target @@ -569,6 +572,8 @@ if ($nboftargetok) { if ($target eq 'DEB') { + $olddir=getcwd(); + $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -671,19 +676,22 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache conf files + # Apache and lighttpd conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - - # Dolibarr conf files - # TODO + print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -729,17 +737,15 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - print "Go to directory $BUILDROOT\n"; - $olddir=getcwd(); - chdir("$BUILDROOT"); - - # Creation of binary package (to build without sources) + # Creation of binary package (to build without sources) + #print "Go to directory $BUILDROOT\n"; + #chdir("$BUILDROOT"); #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Creation of source package + # Prepare source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -751,6 +757,7 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; + $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -766,6 +773,9 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; + + # Creation of source package + print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 3cc548e1c0a..d7172d651f0 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -27,7 +27,7 @@ * \file htdocs/includes/modules/modMyModule.class.php * \ingroup mymodule * \brief Description and activation file for module MyModule - * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $ + * \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); @@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='generic'; - // Defined if the directory /mymodule/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 718c842d046..34e7f48cea8 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -20,7 +20,7 @@ /** * \file htdocs/admin/boxes.php * \brief Page to setup boxes - * \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $ */ require("../main.inc.php"); @@ -278,7 +278,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -394,7 +394,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -470,5 +470,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $'); +llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $'); ?> diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index a907f47663a..671bd69a0e4 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2010 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ /** * \file htdocs/admin/modules.php * \brief Page to activate/disable all modules - * \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $ */ require("../main.inc.php"); @@ -79,12 +79,35 @@ $modules = array(); $orders = array(); $categ = array(); $dirmod = array(); +$modulesdir = array(); $i = 0; // is a sequencer of modules found $j = 0; // j is module number. Automatically affected if module number not defined. -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $althandle=@opendir($dirroot); + if (is_resource($althandle)) + { + while (($file = readdir($althandle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                              "; dol_syslog("Scan directory ".$dir." for modules"); @@ -449,5 +472,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $'); +llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $'); ?> diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index bee00b52906..6af9b54e7f0 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -21,7 +21,7 @@ * \file htdocs/admin/perms.php * \ingroup core * \brief Page d'administration/configuration des permissions par defaut - * \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $ + * \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $ */ require("../main.inc.php"); @@ -76,10 +76,34 @@ $db->begin(); // Charge les modules soumis a permissions $modules = array(); -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +$modulesdir = array(); +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                              "; $handle=@opendir($dir); @@ -194,5 +218,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $'); +llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $'); ?> diff --git a/htdocs/boxes.php b/htdocs/boxes.php index 2affdf654d3..d426e618377 100644 --- a/htdocs/boxes.php +++ b/htdocs/boxes.php @@ -22,7 +22,7 @@ * \brief File of class to manage widget boxes * \author Rodolphe Qiedeville * \author Laurent Destailleur - * \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $ */ @@ -220,7 +220,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php"); + $sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); } else { @@ -281,7 +281,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index c79d46fbeb5..698cceb4966 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,11 +11,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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ -/* \version $Id$ */ +/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index f91946e11c0..2d89cfd2388 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.js @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ // Instanciation et initialisation de l'objet xmlhttprequest diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index f3a440b4929..b18bf124ae4 100644 --- a/htdocs/cashdesk/tpl/validation1.tpl.php +++ b/htdocs/cashdesk/tpl/validation1.tpl.php @@ -15,8 +15,7 @@ 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, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with this program. If not, see . -->
                              trans("Summary"); ?> @@ -40,9 +39,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ?> trans("TotalTTC"); ?> prix_total_ttc(),'MT').' '.$conf->monnaie; ?> trans("PaymentMode"); ?> - mode_reglement()) - { + { case 'ESP': echo $langs->trans("Cash"); $filtre='courant=2'; @@ -53,7 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 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"); @@ -65,16 +64,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. echo $langs->trans("Reported"); $filtre='courant=1 OR courant=2'; $selected=''; - break; + break; default: $filtre='courant=1 OR courant=2'; $selected=''; } - + ?> - - mode_reglement() == 'DIF' ) { @@ -100,10 +99,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

                              - 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/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 259dc4dbce5..96de90124f9 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -48,7 +47,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -67,7 +66,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -78,17 +77,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index e05eaa66ecf..0efb704828f 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ + * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -1032,5 +1031,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index d2f2a7aae7e..5da397b4183 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ + * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ */ require('../main.inc.php'); @@ -673,5 +672,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); +llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index e6559c2ae2e..c5664164e74 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -16,8 +16,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -25,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $ + * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ */ @@ -145,13 +144,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard + $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard + $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/'; } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php index 07fed567b48..c21450bb8cb 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ + * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index cb4a0f7a5cf..e24b3c7c717 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -23,15 +23,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $ + * \version $Id: html.form.class.php,v 1.193 2011/07/31 23:45:14 eldy Exp $ */ @@ -161,8 +160,10 @@ class Form $htmltext=str_replace("\n","",$htmltext); $htmltext=str_replace('"',""",$htmltext); - $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip - $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip + else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip + else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag $s=""; if (empty($notabs)) $s.=''; diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 8deeda0fb57..2ca2f82789e 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/interfaces.class.php * \ingroup core * \brief Fichier de la classe de gestion des triggers - * \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $ + * \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $ */ diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 3148174f5af..13a97bf54b3 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,14 +20,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -64,7 +65,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index c03b55d2347..97d4d8252d3 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ + * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ */ require_once("../main.inc.php"); @@ -1669,7 +1668,7 @@ print '
                              '; $db->close(); -llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); +llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); /* diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 257b95e4e3c..6f6c7ed2a1b 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -65,7 +64,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.30 $'); + $ver=explode(' ','$Revision: 1.31 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 127eb16e389..446606ef055 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -64,7 +63,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
                              This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.27 $'); + $ver=explode(' ','$Revision: 1.28 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 9c90d1fcc94..46fa4c9ccc4 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,9 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* or see http://www.gnu.org/ +* along with this program. If not, see . */ /** @@ -22,7 +20,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id$ + * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -61,7 +59,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
                              This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision$'); + $ver=explode(' ','$Revision: 1.14 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index ec7e1af07c6..7055bef4b69 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php index 42780551928..c7bab37ad4b 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.10 2011/07/31 23:28:10 eldy Exp $ + * \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis 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/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 1; // Data directories to create when module is enabled diff --git a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index b1e3f5a2638..067e831b0b4 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,504 +1,503 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; If not, see . + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index b1e3f5a2638..e5f0ff4c0e5 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + License along with this library; If not, see . Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/index.php b/htdocs/index.php index f027e94a35a..5998094d362 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -573,7 +574,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); +llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9b19d9793fc..3724ef23d95 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 9978c8f437a..1d2084e7c7f 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: default.css,v 1.24 2011/08/03 01:32:42 eldy Exp $ */ body { diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 737e16cc10c..20ef1080e85 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ + * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index c9713870c22..5d7fca530f2 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index e7b45a476f1..d7df4ac6929 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 62e0a4a90cf..9a0dd0fcc43 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ + * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 50fa9904890..0037190af06 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 2e0fccb0051..6d19b01e197 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ + * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 223a2eb6d92..3050d37833c 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -74,12 +75,10 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -$lockfile = '../../install.lock'; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; -#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here -$lockfile = '../../install.lock'; + if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -179,7 +178,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists($lockfile)) +if (file_exists('../../install.lock')) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
                              '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index 841136fff8b..c786f91346c 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ + * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 9d08a56e41c..275298588e2 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 1f046a29bc4..1c43326d70f 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $ -- -- @@ -158,21 +158,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1); -- Regions Chile (id country=67) -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1); -- Regions San Salvador (id country=86) INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1); diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 9a109ab3fdc..e3963e8e68f 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $ -- -- @@ -566,6 +566,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1); +INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1); diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index 56ceea3d807..da244f79951 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index 3a248c2f49f..eee5dfa185a 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index dcbaf2faaf4..e3922b97f65 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index 1dd3cb59a62..b7f6c71c87e 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,10 +11,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index 5e93e39d048..f3299990858 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index e3ed8196d17..1f14cc8c142 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 176e5c796e2..5017ce0c60d 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index db630463dbf..f58db2b32a6 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index c67d263853d..079caa7dde4 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 07fa2abaa83..4bb81528e74 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index e29b3f306f5..720413ac480 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index c7fa6b6dd1f..cb0b557b438 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index 6a597996424..a3a19cc2125 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 78e174b9817..1ec498e6bc2 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a535a5098e..3a17978bb0c 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index f6395abbfcd..96d456312df 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 9c28f697f83..488b0a564eb 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index 988d9c26136..d8701c52c01 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ -- -- @@ -34,4 +33,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2d1a3c62a39..2fd47385a90 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index 4238000eb14..da98640fd25 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 6e596be24e5..789ad16fce2 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index e2faed3cba3..48b77951e1f 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index cf7e9e96275..59bd3d1ef00 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index 655848a50ae..cd2f27a5dca 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ -- -- ============================================================================ 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 e32055ea452..cdc633ca281 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.84 2011/07/29 19:59:10 eldy Exp $ +-- $Id: 3.0.0-3.1.0.sql,v 1.83 2011/07/28 22:22:32 eldy Exp $ -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page @@ -131,9 +131,6 @@ 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; @@ -483,4 +480,3 @@ ALTER TABLE llx_don ADD phone_mobile varchar(24) after email; ALTER TABLE llx_don ADD phone varchar(24) after email; ALTER TABLE llx_user ADD civilite varchar(6) after entity; - diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 968a131e2bb..42f86f1c447 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 6e6e960072b..685170362fd 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 02ff06ba9f1..921bc569980 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index f22262c9353..d5902b539c7 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index b2cdf08af5f..ddd3d734ff7 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 031bfb614e1..8c5c23bbe62 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index 3aa9555979e..f7b876eed86 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 4703aa32ddd..8d34e2a9c78 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index 69bf706ca68..ad6f448e3dc 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 9156b439833..51d66c04584 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index db64e0cbf9c..7df7f21a3b9 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index a7efcbd0f6d..31676d7d6e2 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index 7e4fa074e71..bc9d9ad0936 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index d23a1367f92..18eed730ab8 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index 2b2db5af657..ade41da746e 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index b5c9175202b..62a88236480 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 6ed1e00dd88..015a9e9b4c0 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index d1279c21eb2..296b49fc93f 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 822a69bc4ec..9cedf70e7ca 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index aba765190ee..55718d8ffb5 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index eded16c49fe..abc9baa2d8c 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index e39fbf71f12..3dd83585bcd 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 3710a87470a..217edcaddbb 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index ad41449f288..5869f24d8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index f6301a24919..5db17f19069 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index cd68a9cdb40..5f66ff625f0 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index 890c7597862..b0546729ef0 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index d67cf7fe4b8..4794113f8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5c06c73c69d..5fc25f57339 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 115bd310d70..5746cce26aa 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index d3c71cc4a70..ba1e56e2b94 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index 10c4cc2d853..de9c23e9c05 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,11 +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, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- --- $Id$ +-- $Id: llx_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index 09365976d78..cce9d04707b 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 463b1235094..93e8e3d99a7 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index c81a2b3e830..b0f31fe7116 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index 821fe3e5c04..cb2251cfaf6 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 9380607010d..8bebcf13116 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index e524d9c937a..b30354cae19 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index 0b0b34390c4..b026a40d762 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 7b5fa661d7d..39d21cee7b9 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index e2f225fe608..d1e6b216b4b 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 66cd5111325..60af7723f30 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index ebca12ab5da..cb223ae5532 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 3872bedd39d..415b8526793 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index bed4ad41dfc..5c54695f608 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 23cd0f575ed..93ef5d59770 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index f46d2a56c33..7702a8cf21e 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 4669de108f4..46a35567e95 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index a6bb8ca70f7..c2c43a3a625 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 5637e5a987d..547500d7f33 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index 884d8274cfd..bf7ed18af80 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index 2b6dea6cbd3..d0dceaf0fe1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 76aecebbb9a..192183be0c1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index 665a210d74b..d6d673962b9 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index 7fcd57e31eb..c8deefef6d7 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index e1cab3b3368..757653f1fc2 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f97e458be6b..f2fb7fda4d3 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 165a8550331..7a228ec1572 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 6efa388ef81..120e27ae77d 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index c8824b2d04e..a5e3fd8721b 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 311183c87f4..418e37a85b1 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 2d00f620e02..1cc5dbfaf0e 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 02052920c8a..84c72e0839b 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 0f608cbc171..8cf0ec900f8 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 75b40946559..2eed307bc54 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index 76caf44356d..c977dd9dd21 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 861671e3607..8307ca88eb6 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 46504e8a1c4..9a7bda88c28 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index dc284fc8cea..725ddbfeb90 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index 4f8736a3a14..a1feeb33f8b 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -13,8 +13,7 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -24,7 +23,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 85ea592d950..1e141b7768a 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 9fad6cc333e..79d54faf623 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index d6bd27758b4..97638937c74 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 40759cdc50b..211af70a854 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 80e73c43399..7c4c534451d 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index 4c466e0c02b..f2330322a5f 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 46a39b3c9e7..8e4492c28a9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 60641bf1876..39be52cf374 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index cfe126b5adf..e93ce9b4354 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index 7e12e06beb7..baa01289b96 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index 83eb804c875..bd19d25f1a5 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index 6236e113766..eb95b9fe66c 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index cf5121c34f9..2c95fde3255 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index cabdcce3a80..d62011351c4 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index ebaf9582414..a07ff049d61 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index fa9a85aac1f..730bc11ac98 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index ec8931763bf..6f129f2feec 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 7958b56f354..172a2432ee1 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ --- Supprimme orphelins pour permettre monte de la cl +-- Supprimme orphelins pour permettre mont�e de la cl� -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index 3f848c9ffe2..c13c0aa6019 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index df6d49827f6..f0c65456e5c 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index 9bb45f9d326..be4e60a9a97 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 91914ab66c7..23cfd068495 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b39863cab..d1b18165255 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index e964fbc2f5e..19ec675f973 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a747c714fb3..a53a24d9a66 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 16ecb365d6c..46639ca7c1e 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index bfce896eb19..d1ba0645e05 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index 51234007ee1..b7fc52403af 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index eead2907fa2..4187f526393 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 1c757fa6c86..7b74d8b506d 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ --- Supprimme orhpelins pour permettre monte de la cl +-- Supprimme orhpelins pour permettre mont�e de la cl� -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index 79b52ba399c..f1f4a75b604 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 3757e4522bf..39b89773316 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index f5987250001..98b29b1f715 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 9c4a5e340ab..0eb566317d0 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 906d0a3e2f4..3fb9f7d6d2d 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index 20bb329ff0e..ba595100b5f 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index 2063a310fb8..b71d2697b85 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index a99b42859c7..61d63046fac 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index f0e0a065089..0e20201f4cb 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 06af8a78575..154f0b51006 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1c5d5c30173..1dc4941012a 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index e43f4cb118c..a208aa5fff0 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index e4eb41f3bb4..f60029ee290 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 463675b10b7..2833920b746 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index fc998bd6edb..7987ca819c1 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index 1e9b0495d34..e027d471e23 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ +-- $Id: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index b899c4303e1..8b279dc578b 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 5d6d86617e6..684c5aa5a7c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index 6de1b23eb64..cdccf3eb6ec 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index 04491e0878c..fee45753759 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 575930a728c..9401f679071 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 46b769b8afc..757e8d2b447 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index e1b82141ea1..d0118ebdc6c 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 19824c860de..57d92bc8ce9 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 455916a3010..6f2ddcf56b9 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 94e726796c5..6cf13137710 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index 8dbbb572f29..cee3ace0ec3 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 923c2441987..34d0bbac03b 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index 88cf83a3cc3..ef97e48a251 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index 68e21d26061..b674a0cf11d 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index f289b9cb514..5e3620cba87 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index a2e54d34770..bd3c0c7d780 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index dbeec277f88..1524eb7a77b 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index e3e5900fb74..75a4ce8fd06 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index 0669065b7d3..eafe6bd31e1 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index dcca0174817..6a06c0c70b5 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index 99cf1edd744..d4aa4b26d99 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index 415b44c6a35..b55d734674f 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index ba8b40b3c0a..22a5b9d5c52 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 40e131fefdf..5edbea4808d 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index bc11ca42c8f..5313952606a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index 8d4a4ecdcbf..c210f906b9b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index f43ab1e746a..29598bb4963 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index a52d3ed4a8b..cfaad1061df 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 4e9f0d1da0e..521d666742d 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index c9891219f4f..29af17f7c08 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 6b8f7176dee..917d6fc5cdf 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 399dd175311..87245438b4d 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index c06074d4709..373267c8921 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index 1e3f21d0eb7..b67427b9de8 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 08450aa204f..8f00ee95200 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index 9b0104ccfe5..edc76a392b0 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 0782e089170..302248ae299 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 68b6cd9a315..9c741080a27 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 177be65fb88..4dd0ae15ad4 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index d573c90eb18..ffc0666074d 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index e0b2c2494ad..96f122e59cd 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 92000240642..4beccac04b8 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 6240a2ed5c0..484cebf6a2a 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index e2c4be38a5f..a56201f7dba 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 51e133a86dc..84f6077e5ba 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index aab9c69c1a7..46685416239 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index dc9732c0719..1d41d1ab59e 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index 663adaffe60..d6dd854a240 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 73dc6489461..0b7d6a61f56 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index 0b42446740b..c1ee00edd07 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index 7d728850185..d694d696801 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index d062249c3b8..925ca9eee81 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f33c92ea7fe..f67337de388 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 92f21a35f28..8c8454fbc28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index e62275df23d..6c673570cfc 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 29ad3853f90..9c05ed97a8d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Ocbo +-- Copyright (C) 2005 Marc Barilley / Oc�bo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b9ba378d81f..b127b194fa5 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 8771b0ddda8..5c8ea94ed09 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 8bb011f7280..94ba92d4856 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 1aba5d286d1..4017ae32682 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index e0c4fd61701..2c77ae3447c 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 1e721e86788..52c0a3e2a03 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index d4ea3ad5535..439b2a68098 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index 6f8d6a8cf97..f01b7d02e8e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index 854ec6e826e..bd1e805aed2 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index f1e90520593..bfc2162ceca 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 15d3bda5ba2..784e3d37507 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 66a61851cae..029bc528b6e 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 195d2464738..9c066c54436 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index 44a301a2db7..f4e38524d25 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index 237b5c23030..f03d92ce651 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 3bec7551161..2c9c2d929db 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index 45845593162..d9e9ecd43a7 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 672374961d5..01cabfec865 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index d8d9443595d..696cf49c337 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index f21fed4d1af..170bd56f390 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index a501b4db4b6..5a3d71b489a 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index 41a91a9aa5f..d29449c2503 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index e12dbc6fb12..86f114d395b 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index 1a83bee6508..ce320558709 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 93a28593f8e..76f76ff08ed 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index ec2bb01863b..133687c7466 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 552a985abd4..6ccd3aa39fb 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index 63b28ac8410..e24a8918c5b 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index e7ccde53858..26e451271cb 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index a1619df5cb5..40b07d29305 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index 309c60b660f..e21669e63d7 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index c92472f7af5..d094512d975 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index 3fb70995900..a75fb9aa76d 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ +-- $Id: llx_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index e7fc66a0ed6..a0d88737e3f 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 57b252ed2ea..9e28a37d6bb 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index b8453ea821c..376447586c9 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index 00268974476..e7528a03f28 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 16bf4dea7f0..4f994cf57aa 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index eff6387abee..1a7fdfd755f 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index f53599483a4..a618e3d8790 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index b9643f019c3..902f2b4fd5f 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index db4cdd2581c..1f5500e2eb1 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index 6bf45f749f5..c7d84e27326 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 7db41de673c..523eb3b37e0 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index 8dc4636c87e..bf057b4ad75 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index d500fc1b7cb..ade6a40a80d 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index a515ba541bf..bca670bbb98 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index b742b82dafc..7481589df00 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index fff909a0ec8..4adaa1a56ff 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index fb65e9b7e84..16631c76b76 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 332b1305d38..3df14473a7e 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index ca4206eb6fc..c3958313ea3 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 68e1d4f20e9..910d2ab2072 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 8714e7e4a07..5c7f2e9a59c 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index 7d3b0eecd98..cbaadb10091 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index 8bdd7193d1a..e88665b5a34 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 367d45e8525..86916c216a2 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 28b28aeb762..23065b261c8 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ +-- $Id: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index d78db14c30b..3f58eaf698b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 68e46fd120d..18924ff6ac5 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 6acb2db4585..8056a150fc3 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 838f502bfdb..1b5ea5516d4 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index f21099e9c5e..e61985c7dd1 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index f771be5ef5a..7bf81b7fbe9 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 0033bca36bc..1fb0d708dfa 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 8037c9cd7e5..6df43634ec4 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 99234b6660f..7b6cbd91645 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index dca8e80f856..810781ed6d9 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index f3a58aa1433..2e89f083575 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index 98c56c37567..fd656c736ef 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 100d9fe82b0..87f6416c6c5 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ -- ============================================================================ CREATE LANGUAGE plpgsql; diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html deleted file mode 100644 index 38e0f007a15..00000000000 --- a/htdocs/langs/es_ES/html/gpl.html +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - -H. Licencia Pública GNU - - - - - - - - - - - - - -

                              Licencia Pública GNU

                              - - - - -
                              - -GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 - -
                              - -

                              Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, - MA 02139, USA.

                              -

                              Está permitido, a cualquier persona, copiar y distribuir copias tal cual de - este documento de licencia, sin la introducción de cualquier cambio. -

                              - -
                              -

                              Introducción

                              -

                              Las licencias de muchos softwares se desarrollan para asegurar la libertad - de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, - al contrario, pretende garantizar la libertad de compartir y alterar softwares - de libre distribución - volviéndolos de libre distribución también para cualquier - de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares - de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla - (algunos softwares de la FSF son cubiertos por la GNU Library General Public - License).

                              -

                              Cuando nos referimos a softwares de libre distribución, nos referimos a la - libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar - la libertad de distribución de copias de softwares de libre distribución (y - cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos - fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se - hacen algunas restricciones, para asegurar los derechos de los programadores, - prohibiendo a todas las personas su negación o la solicitación de su abdicación. - Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución - o modificación del software.

                              -

                              Por ejemplo, al distribuirse copias de determinado programa, por una tasa - determinada o gratuitamente, se debe informar sobre todos los derechos incidentes - sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia - Pública General GNU.

                              -

                              La protección de los derechos envuelve dos pasos: (1) copyright del software - y (2) licencia que da permiso legal para copia, distribución y/o modificación - del softwares.

                              -

                              Aún para la protección de la FSF y del autor es importante que todos entiendan - que no hay garantías para softwares de libre distribución. Si software se modifica - por alguien y lo pasa adelante, este software no más reflejará el trabajo original - del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                              -

                              Finalmente, cualquier programa de libre distribución está constantemente amenazado - por las patentes de softwares. Buscamos evitar el peligro de que distribuidores - de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. - Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación - de patente se debe hacer permitiendo el uso por cualquier individuo, sin la - necesidad de licencia de uso.

                              -

                              Los términos y condiciones precisas para copia, distribución y modificación - siguen abajo:

                              -
                              -

                              Licencia Pública General GNU

                              -

                              TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN -

                              - -
                                - -

                              1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga - un aviso colocado por el detentor de los derechos de autor diciendo que aquel - podrá ser distribuido en las condiciones de la Licencia Pública General. El - Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado - en un Programa y significa tanto el propio Programa, como cualquier de los - trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, - un trabajo que contenga el Programa o una parte de este, en su forma original - o con modificaciones o traducido para una otra lengua (la traducción está - incluida sin limitaciones en el término ``modificación'').

                                -

                                Actividades distintas de copia, distribución y modificación no están cubiertas - por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa - no está restringido y la salida del Programa está cubierta solamente en - el caso de que su contenido contenga trabajos basados en el Programa (independientemente - de que hayan sido creados por la ejecución del Programa). Si esto es así, - depende de las funciones ejecutadas por el Programa.

                                2. - -

                              2. El código fuente del Programa, de la forma como fue recibido, puede ser - copiado y distribuido, en cualquier media, desde que sea providenciado un - aviso adecuado sobre los copyrights y la negación de garantías, y todos los - avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, - estén inalterados y que cualquier producto oriundo del Programa esté acompañado - de esta Licencia Pública General.

                                -

                                Está permitido el cobro de tasas por el acto físico de transferencia o - grabación de copias, y pueden ser dadas garantías y soporte en cambio del - cobro de valores.

                                3. - - -
                              3. -

                                Se puede modificar la copia o copias del Programa de cualquier forma que - se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir - tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                                - -
                                  -

                                1. Debe existir un aviso destacado de que los datos originales fueron alterados - en los archivos y las fechas de los cambios;

                                  2. - -

                                2. Debe existir un aviso de que el trabajo distribuido o publicado es, - de forma total o parcial, derivado del Programa o de alguna parte suya, - y que puede ser licenciado totalmente sin costes para terceros bajo los - términos de esta Licencia.

                                  3. - -

                                3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, - en el inicio de tu ejecución, presentar la información de copyright y - de ausencia de garantías (o de que la garantía es de responsabilidad de - terceros), y que los usuarios pueden redistribuir el programa bajo estas - condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                                  4. -
                                - - Estos requisitos se aplican a trabajos de modificación en general. Si - algunas secciones identificables no sean derivadas del Programa, y pueden - ser consideradas como partes independientes, entonces esta Licencia y sus - Términos no se aplican a aquellas secciones cuando distribuidas separadamente. - Pero al distribuir aquellas secciones como parte de un trabajo basado en - el Programa, la distribución, como un todo, debe contener los términos de - esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no - a cada una de las partes independientemente de quem los tenga desarrollado. - Más que tener intención de contestar los derechos sobre el trabajo desarrollado - por alguien, esta sección objetiva propiciar la correcta distribución de - trabajos derivados del Programa. - Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado - en él ni a un trabajo basado en él, a un volumen de almacenaje o media de - distribución no obliga la utilización de esta Licencia y de sus términos - al trabajo. -
                                4. - - -
                              4. -

                                Están permitidas, la copia y la distribución, del Programa (o un trabajo - basado en éste) en la forma de código objeto o ejecutable de acuerdo con los - términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                                - -
                                  -

                                1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos - en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada - para manejo de softwares o

                                  -
                                  2. -

                                2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, - de poner a disposición a terceros, por un coste no superior al coste del - medio físico de almacenaje, una copia completa de los códigos fuente en - medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                                  -
                                  3. -

                                3. Esté acompañada con la misma información recibida en relación con la - oferta de la distribución del código fuente correspondiente (esta alternativa - solamente está permitida para distribuciones no comerciales y solamente - si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, - de acuerdo con la sección 2 arriba).

                                  -
                                  4. -
                                - El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones - en aquel trabajo. Cuando se habla en códigos fuentes completos significa - hablar de todos los fuentes de todos los módulos, además de las definiciones - de interfaces asociadas, archivos, scripts utilizados en la compilación - y instalación del ejecutable. Como una excepción excepcional, el código - fuente distribuido podrá no incluir algunos componentes que no se encuentren - en su escopo, como compilador, kernel, etc... para el SO donde el trabajo - sea ejecutado. - Si la distribución del ejecutable o objeto se hace, a través de acceso - a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente - de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos - con los objetos simultáneamente -
                                5. - -
                              5. -

                                No está permitida la copia, modificación, sublicenciamiento o distribución - del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier - tentativa de copia, modificación, sublicenciamiento o distribución del Programa - está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. - Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, - no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas - de esta Licencia.

                                6. -
                              6. -

                                No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá - documento o contrato que garantice permiso de modificación o distribución - del Programa o sus trabajos derivados. Estas acciones están prohibidas por - ley, en el caso de que no se acepten las condiciones de esta Licencia. La - modificación o distribución del Programa, o cualquier trabajo basado en éste, - implica en la aceptación de esta Licencia y de todos los términos de ésta - para copia, distribución o modificación del Programa o trabajos basados en - éste.

                                7. -
                              7. -

                                Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), - el recipiente automáticamente recibe una licencia del detentor original de - los derechos de copia, distribución o modificación del Programa objeto de - estos términos y condiciones. No pueden ser impuestas otras restricciones - en los recipientes.

                                8. - -
                              8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes - o derechos de autor, se impongan restricciones, que contradigan esta Licencia, - estos no exentan de su aplicación. Si no es posible distribuir el Programa - de forma a garantizar simultáneamente las obligaciones de esta Licencia y - otras que sean necesarias, entonces el Programa no podrá ser distribuido. -

                                Si esta Sección se considera, inválida por cualquier motivo particular - o general, su resultado implicará en la invalidación general de esta licencia - en la copia, modificación, sublicenciamiento o distribución del Programa - o trabajos basados en éste.

                                -

                                El propósito de esta sección no es, de forma alguna, incitar a quien quiera - que sea a infringir derechos reclamados en cuestiones válidas y procedentes, - y si proteger las premisas del sistema de libre distribución de software. - Muchas personas tienen hecho contribuciones generosas al sistema, en la - forma de programas, y es necesario garantizar la consistencia y credibilidad - del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución - de los softwares.

                                -

                                Esta sección pretende hacer claro los motivos que crearan las demás cláusulas - de estas Licencia.

                                9. - -
                              9. -

                                Si la distribución del Programa, dentro de los términos de esta Licencia, - tiene restricciones en algún País, por patentes o derechos de autor, el detentor - original de los derechos de autor del Programa bajo esta Licencia puede adicionar - explícitamente limitaciones geográficas de distribución, excluyendo aquellos - Países, haciendo con que la distribución solamente sea posible en los Países - no excluidos.

                                10. - -
                              10. -

                                La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) - puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública - General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos - objetivos y el espirito de la presente versión, pudiendo variar en detalles - referentes a nuevas situaciones encontradas.

                                -

                                A cada versión se da un número distinto. Si el Programa especifica, un - número de versión determinado de esta Licencia, que tenga en su contenido - la expresión ``o versión más actualizada'', es posible optar por las condiciones - de aquella versión o de cualquier versión más actualizada publicada por - la FSF.

                                11. - -
                              11. -

                                Si deseas incorporar parte del Programa en otros programas de libre distribución - de softwares hace falta autorización formal del autor. Para softwares que - la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde - que mantenido el espirito y objetivos originales de esta Licencia.

                                12. -
                              - -

                              AUSENCIA DE GARANTÍAS

                              -
                                -

                              1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER - GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE - EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS - DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, - LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD - Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS - CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y - REPAROS JUZGADOS NECESARIOS.

                                2. -

                              2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR - LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN - RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE - HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS - O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES - O DAÑOS.

                                -

                                FIN DE LA LICENCIA

                              - - -
                              -

                               

                              -

                              Apéndice

                              -

                              ¿Cómo aplicar estos términos a nuevos softwares?

                              -

                              Si has desarrollado un nuevo programa y deseas su amplia distribución para - el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, - que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                              -

                              Para esto basta con anexar este aviso al programa. Se recomienda indicar aún - en el inicio de cada archivo fuente la ausencia de garantías y una anotación - de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                              -

                              <nombre del programa y función> Copyright (C) 199X <Autor> -

                              -

                              Este programa es un software de libre distribución, que puede ser copiado - y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo - con la publicada por la Free Software Foundation, versión 2 de la licencia o - (a criterio del autor) cualquier versión posterior.

                              -

                              Este programa se distribuye en la expectativa de ser útil a sus usuarios, - pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE - ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General - 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. -

                              -

                              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:

                              -

                              Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares - NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software - de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. - Teclea 'muestra condic' para mayores detalles.

                              -

                              Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las - partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos - pueden variar o pueden ser accionados por otras interfaces como clic de ratón, - etc...

                              -

                               

                              -
                              -
                              - -www.conectiva.com - -
                              - - - - - diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt deleted file mode 100644 index 3efbe1ccee7..00000000000 --- a/htdocs/langs/nl_BE/html/gpl.txt +++ /dev/null @@ -1,340 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -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 deleted file mode 100644 index 778e2b02b41..00000000000 --- a/htdocs/langs/nl_NL/html/gpl.txt +++ /dev/null @@ -1,339 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van -deze licentie. \ No newline at end of file diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index c2d47f668da..4092c55ff2d 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ /** * \file htdocs/lib/admin.lib.php * \brief Library of admin functions - * \version $Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis 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.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $ */ function security_prepare_head() { @@ -615,16 +615,41 @@ function Activate($value,$withdeps=1) // Activate module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } $objMod = new $modName($db); @@ -700,20 +725,46 @@ function UnActivate($value,$requiredby=1) $modName = $value; $ret=''; + $modulesdir=array(); // Desactivation du module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } if ($found) diff --git a/htdocs/lib/ajax.lib.php b/htdocs/lib/ajax.lib.php index 55def736688..7db1908bc49 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ */ diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1bdeb9562e6..49b67f9349a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 1d5b4951490..eedd6a8841c 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -29,7 +29,7 @@ * \ingroup core * \brief File that defines environment for all Dolibarr process (pages or scripts) * This script reads the conf file, init $lang, $db and and empty $user - * \version $Id: master.inc.php,v 1.351 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ */ @@ -70,14 +70,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root[]=$value; + $conf->file->dol_document_root['alt']=$value; } } diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index 454073d9730..d6bf7267439 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index b5304ba4198..6e1e7b262f4 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index bda35165079..b0a7c2dece6 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id$ + * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ */ if (session_id() == "") session_start(); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 8bccf934120..1da2adb751e 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ + * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index efbd289cb3f..a65f888ab11 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ + * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ */ require("../main.inc.php"); @@ -1645,6 +1646,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 8f373b577e8..79601ea1031 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 724900dc500..8cf57ec0b64 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ + * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ */ require("../main.inc.php"); @@ -271,5 +272,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); +llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); ?> diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 1dfd99cc99e..ec5d660daef 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -25,7 +25,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.125 2011/07/31 23:22:57 eldy Exp $ + * \version $Id: soc.php,v 1.126 2011/08/01 00:38:49 eldy Exp $ */ require("../main.inc.php"); @@ -587,7 +587,8 @@ else if ($conf->fournisseur->enabled && (GETPOST("type")=='f' || GETPOST("type")=='')) { $object->fournisseur=1; } if (GETPOST("private")==1) { $object->particulier=1; } - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prenom=$_POST["prenom"]; $object->particulier=$_REQUEST["private"]; $object->prefix_comm=$_POST["prefix_comm"]; @@ -1093,7 +1094,8 @@ else if (! empty($_POST["nom"])) { // We overwrite with values if posted - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prefix_comm=$_POST["prefix_comm"]; $object->client=$_POST["client"]; $object->code_client=$_POST["code_client"]; @@ -1967,5 +1969,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.125 $'); +llxFooter('$Date: 2011/08/01 00:38:49 $ - $Revision: 1.126 $'); ?> \ No newline at end of file diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index edb62d728d5..78ca25e85a6 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $ + * \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index f93935ffb16..e78dff8f646 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id$ + * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index e4e52c611b4..9edcafd59c0 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/group/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.39 2011/07/31 23:21:25 eldy Exp $ + * \version $Id: perms.php,v 1.40 2011/08/01 13:15:53 hregis Exp $ */ require("../../main.inc.php"); @@ -93,10 +93,34 @@ if ($_GET["id"]) // Charge les modules soumis a permissions $modules = array(); - foreach ($conf->file->dol_document_root as $dirroot) + $modulesdir = array(); + + foreach ($conf->file->dol_document_root as $type => $dirroot) + { + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } + + foreach ($modulesdir as $dir) { - $dir = $dirroot . "/includes/modules/"; - // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                              "; $handle=@opendir($dir); @@ -292,5 +316,5 @@ if ($_GET["id"]) $db->close(); -llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.39 $'); +llxFooter('$Date: 2011/08/01 13:15:53 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index adb7fa764b6..47710b31d9d 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.56 2011/07/31 23:19:42 eldy Exp $ + * \version $Id: perms.php,v 1.57 2011/08/01 13:15:54 hregis Exp $ */ require("../main.inc.php"); @@ -120,12 +120,34 @@ $db->begin(); // Search all modules with permission and reload permissions def. $modules = array(); +$modulesdir = array(); -$listdir=$conf->file->dol_document_root; -foreach($listdir as $dirroot) +foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir=$dirroot."/includes/modules/"; + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} +foreach($modulesdir as $dir) +{ $handle=opendir($dir); if (is_resource($handle)) { @@ -373,5 +395,5 @@ print '
                              '; $db->close(); -llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.56 $'); +llxFooter('$Date: 2011/08/01 13:15:54 $ - $Revision: 1.57 $'); ?> From ff8c96002558f91348c2e364e6e569c87973afe1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Jul 2011 23:05:13 +0000 Subject: [PATCH 096/118] Work on aps package --- build/makepack-dolibarr.pl | 236 +++++++++++-------------------------- 1 file changed, 66 insertions(+), 170 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 20c5ba415e9..f191d88c7f9 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.129 2011/08/01 18:22:26 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.121 2011/07/28 23:05:13 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -11,7 +11,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="1"; -$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="auto"; # auto use value found into BUILD @LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.121 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -254,18 +254,15 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliW*-*`; $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliM*-*`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.changes`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`; $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`; @@ -276,10 +273,6 @@ 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`; @@ -298,6 +291,11 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`; $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; $ret=`rm -fr $BUILDROOT/$PROJECT/document`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`; @@ -308,7 +306,6 @@ 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`; @@ -318,9 +315,6 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; } # Build package for each target @@ -419,19 +413,14 @@ if ($nboftargetok) { } if ($target eq 'RPM') { # Linux only - #$ARCH='i386'; - $ARCH='noarch'; + $ARCH='i386'; if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; } $newbuild = $BUILD; - # For fedora - $newbuild =~ s/(dev|alpha)/0.1.a/gi; # dev - $newbuild =~ s/beta/0.2.beta1/gi; # beta - $newbuild =~ s/rc./0.3.rc1/gi; # rc + $newbuild =~ s/(dev|alpha)/0/gi; # dev + $newbuild =~ s/beta/1/gi; # beta + $newbuild =~ s/rc./2/gi; # rc if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale - #$newbuild =~ s/(dev|alpha)/0/gi; # dev - #$newbuild =~ s/beta/1/gi; # beta - #$newbuild =~ s/rc./2/gi; # rc - #if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale + # now newbuild is 0-0 or 0-3 for example $REL1 = $newbuild; $REL1 =~ s/-.*$//gi; if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; } print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; @@ -449,93 +438,16 @@ 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 -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$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`; @@ -563,17 +475,11 @@ if ($nboftargetok) { print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n"; $cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\""; $ret=`$cmd`; - print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n"; - $cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\""; - $ret=`$cmd`; - next; } if ($target eq 'DEB') { - $olddir=getcwd(); - $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -619,33 +525,20 @@ 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`; @@ -676,22 +569,19 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache and lighttpd conf files + # Apache conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; + + # Dolibarr conf files + # TODO # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -708,7 +598,17 @@ if ($nboftargetok) { print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`; - # Set owners + #print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n"; + #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`; + + # copyright (to build binary package directly without sources. Useless if we build from sources) + #print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n"; + #$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`; + + # changelog (to build binary package directly without sources. Useless if we build from sources) + #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`; + #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`; + print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`; @@ -737,45 +637,47 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - # Creation of binary package (to build without sources) - #print "Go to directory $BUILDROOT\n"; - #chdir("$BUILDROOT"); + print "Go to directory $BUILDROOT\n"; + $olddir=getcwd(); + chdir("$BUILDROOT"); + + # Creation of binary package (to build without sources) #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Prepare source package + # Creation of source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; $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/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; - $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; - $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; - $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; - $ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`; - $ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`; - $ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/debian/po"`; - $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`; + $ret=`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"`; # Add files also required to build binary package with dpkg-buildpackages - $ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`; $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; - - # Creation of source package - print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; @@ -788,18 +690,12 @@ if ($nboftargetok) { if ($OS =~ /windows/i) { print "Move *_all.deb to $DESTI\n"; - $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; - $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; - $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; - $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; + $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; } else { print "Move *_all.deb to $DESTI\n"; - $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; - $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; - $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; - $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; + $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; } next; } From f07565b675f8ca16ccb60baf27725c2eac02cfe4 Mon Sep 17 00:00:00 2001 From: tiaris Date: Fri, 29 Jul 2011 06:58:52 +0000 Subject: [PATCH 097/118] add constraint on product_id --- htdocs/install/mysql/tables/llx_product_fournisseur.key.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql index 612755ce349..8925d93d301 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2002-2004 Rodolphe Quiedeville --- Copyright (C) 2004-2011 Laurent Destailleur +-- Copyright (C) 2004-2005 Laurent Destailleur -- Copyright (C) 2005-2009 Regis Houssin -- -- This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_product_fournisseur.key.sql,v 1.3 2011/07/29 19:59:33 eldy Exp $ +-- $Id: llx_product_fournisseur.key.sql,v 1.2 2011/07/29 06:58:52 tiaris Exp $ -- ============================================================================ @@ -26,4 +26,4 @@ ALTER TABLE llx_product_fournisseur ADD UNIQUE INDEX uk_product_fournisseur_ref ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_product (fk_product, entity); ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_soc (fk_soc, entity); -ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); +ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); From 43fed1c00d809194106603334973b7c690cb6577 Mon Sep 17 00:00:00 2001 From: tiaris Date: Fri, 29 Jul 2011 06:59:36 +0000 Subject: [PATCH 098/118] canot delete product with supplier refs --- htdocs/product/class/product.class.php | 244 ++++++++++++++----------- 1 file changed, 133 insertions(+), 111 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1da2adb751e..d6f7baf831e 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -25,7 +25,7 @@ * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: product.class.php,v 1.46 2011/07/29 06:59:36 tiaris Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); @@ -191,15 +191,14 @@ class Product extends CommonObject /** * Insert product into database - * @param user User making insert - * @param notrigger Disable triggers - * @return int Id of product/service if OK or number of error < 0 + * @param user User making insert + * @return int id of product/service if OK or number of error < 0 */ - function create($user,$notrigger=0) + function create($user) { - global $conf, $langs; + global $conf ; - $error=0; + $this->errno = 0; // Clean parameters $this->ref = dol_string_nospecial(trim($this->ref)); @@ -251,149 +250,172 @@ class Product extends CommonObject $this->error='ErrorWrongParameters'; return -1; } - if (empty($this->ref)) - { - $this->error='ErrorWrongParameters'; - return -2; - } dol_syslog("Product::Create ref=".$this->ref." price=".$this->price." price_ttc=".$this->price_ttc." tva_tx=".$this->tva_tx." price_base_type=".$this->price_base_type." Category : ".$this->catid, LOG_DEBUG); - - $this->db->begin(); - - $sql = "SELECT count(*) as nb"; - $sql.= " FROM ".MAIN_DB_PREFIX."product"; - $sql.= " WHERE ref = '" .$this->ref."'"; - $sql.= " AND entity = ".$conf->entity; - - $result = $this->db->query($sql); - if ($result) + if ($this->ref) { - $obj = $this->db->fetch_object($result); - if ($obj->nb == 0) + $this->db->begin(); + + $sql = "SELECT count(*)"; + $sql.= " FROM ".MAIN_DB_PREFIX."product"; + $sql.= " WHERE ref = '" .$this->ref."'"; + $sql.= " AND entity = ".$conf->entity; + + $result = $this->db->query($sql) ; + if ($result) { - // Produit non deja existant - $sql = "INSERT INTO ".MAIN_DB_PREFIX."product ("; - $sql.= "datec"; - $sql.= ", entity"; - $sql.= ", ref"; - $sql.= ", price_min"; - $sql.= ", price_min_ttc"; - $sql.= ", label"; - $sql.= ", fk_user_author"; - $sql.= ", fk_product_type"; - $sql.= ", price"; - $sql.= ", price_ttc"; - $sql.= ", price_base_type"; - $sql.= ", tobuy"; - $sql.= ", tosell"; - $sql.= ", canvas"; - $sql.= ", finished"; - $sql.= ", hidden"; - $sql.= ") VALUES ("; - $sql.= $this->db->idate(mktime()); - $sql.= ", ".$conf->entity; - $sql.= ", '".$this->ref."'"; - $sql.= ", ".price2num($price_min_ht); - $sql.= ", ".price2num($price_min_ttc); - $sql.= ", ".($this->libelle?"'".$this->db->escape($this->libelle)."'":"null"); - $sql.= ", ".$user->id; - $sql.= ", ".$this->type; - $sql.= ", ".price2num($price_ht); - $sql.= ", ".price2num($price_ttc); - $sql.= ", '".$this->price_base_type."'"; - $sql.= ", ".$this->status; - $sql.= ", ".$this->status_buy; - $sql.= ", '".$this->canvas."'"; - $sql.= ", ".$this->finished; - $sql.= ", ".$this->hidden; - $sql.= ")"; - - dol_syslog("Product::Create sql=".$sql); - $result = $this->db->query($sql); - if ( $result ) + $row = $this->db->fetch_array($result); + if ($row[0] == 0) { - $id = $this->db->last_insert_id(MAIN_DB_PREFIX."product"); + // Produit non deja existant + $sql = "INSERT INTO ".MAIN_DB_PREFIX."product ("; + $sql.= "datec"; + $sql.= ", entity"; + $sql.= ", ref"; + $sql.= ", price_min"; + $sql.= ", price_min_ttc"; + $sql.= ", label"; + $sql.= ", fk_user_author"; + $sql.= ", fk_product_type"; + $sql.= ", price"; + $sql.= ", price_ttc"; + $sql.= ", price_base_type"; + $sql.= ", canvas"; + $sql.= ", finished"; + $sql.= ", hidden"; + $sql.= ") VALUES ("; + $sql.= $this->db->idate(mktime()); + $sql.= ", ".$conf->entity; + $sql.= ", '".$this->ref."'"; + $sql.= ", ".price2num($price_min_ht); + $sql.= ", ".price2num($price_min_ttc); + $sql.= ", ".($this->libelle?"'".$this->db->escape($this->libelle)."'":"null"); + $sql.= ", ".$user->id; + $sql.= ", ".$this->type; + $sql.= ", ".price2num($price_ht); + $sql.= ", ".price2num($price_ttc); + $sql.= ", '".$this->price_base_type."'"; + $sql.= ", '".$this->canvas."'"; + $sql.= ", ".$this->finished; + $sql.= ", ".$this->hidden; + $sql.= ")"; - if ($id > 0) + dol_syslog("Product::Create sql=".$sql); + $result = $this->db->query($sql); + if ( $result ) { - $this->id = $id; - $this->price = $price_ht; - $this->price_ttc = $price_ttc; - $this->price_min = $price_min_ht; - $this->price_min_ttc = $price_min_ttc; + $id = $this->db->last_insert_id(MAIN_DB_PREFIX."product"); - $result = $this->_log_price($user); - if ($result > 0) + if ($id > 0) { - if ( $this->update($id, $user) > 0) + $this->id = $id; + $this->price = $price_ht; + $this->price_ttc = $price_ttc; + $this->price_min = $price_min_ht; + $this->price_min_ttc = $price_min_ttc; + + $result = $this->_log_price($user); + if ($result > 0) { - if ($this->catid > 0) + if ( $this->update($id, $user) > 0) { - require_once(DOL_DOCUMENT_ROOT ."/categories/class/categorie.class.php"); - $cat = new Categorie($this->db, $this->catid); - $cat->add_type($this,"product"); + if ($this->catid > 0) + { + require_once(DOL_DOCUMENT_ROOT ."/categories/class/categorie.class.php"); + $cat = new Categorie($this->db, $this->catid); + $cat->add_type($this,"product"); + } + } + else + { + $this->_setErrNo("Create",260,$this->error); } } else { - $error++; - $this->error='ErrorFailedToUpdateRecord'; + $this->error=$this->db->error(); + $this->_setErrNo("Create",264,$this->error); } } else { - $error++; - $this->error=$this->db->lasterror(); + $this->_setErrNo("Create",259); } } else { - $error++; - $this->error='ErrorFailedToGetInsertedId'; + $this->error=$this->db->error(); + $this->_setErrNo("Create",258,$this->error); } } else { - $error++; - $this->error=$this->db->lasterror(); + // Le produit existe deja + $this->error='ErrorProductAlreadyExists'; } } else { - // Product already exists with this ref - $langs->trans("Error")." : ".$langs->trans("ErrorProductAlreadyExists",$this->ref); + $this->_setErrNo("Create",263); + } + + /* + * END COMMIT + */ + + if ($this->errno === 0) + { + // Appel des triggers + include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + $interface=new Interfaces($this->db); + $result=$interface->run_triggers('PRODUCT_CREATE',$this,$user,$langs,$conf); + if ($result < 0) { $error++; $this->errors=$interface->errors; } + // Fin appel triggers + + $this->db->commit(); + return $id; + } + else + { + $this->db->rollback(); + return -1; } } else { - $error++; - $this->error=$this->db->lasterror(); + $this->_setErrNo("Create",262); + + return -2; } - if (! $error && ! $notrigger) - { - // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); - $interface=new Interfaces($this->db); - $result=$interface->run_triggers('PRODUCT_CREATE',$this,$user,$langs,$conf); - if ($result < 0) { $error++; $this->errors=$interface->errors; } - // Fin appel triggers - } - - if (! $error) - { - $this->db->commit(); - return $this->id; - } - else - { - $this->db->rollback(); - return -$error; - } + return -1; } + /** + * Positionne le numero d'erreur + * @param func Nom de la fonction + * @param num Numero de l'erreur + * @param error string + */ + function _setErrNo($func, $num, $error='') + { + $this->errno = $num; + dol_syslog(get_class($this)."::".$func." - ERRNO(".$this->errno.")".($error?' - '.$error:''), LOG_ERR); + } + + /** + * Retourne le texte de l'erreur + */ + function error() + { + $errs[257] = "ErrorProductAlreadyExists"; + $errs[262] = "ErrorProductBadRefOrLabel"; + + return $errs[$this->errno]; + } + + /** * Update a record into database * @param id Id of product @@ -2139,7 +2161,7 @@ class Product extends CommonObject $prods[$this->db->escape($rec['label'])][$keyChild] = $valueChild; } } - + return $prods; } else From 7c2d6d646a1e876dccfddfbfbf94b63dcae1c540 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 29 Jul 2011 07:21:45 +0000 Subject: [PATCH 099/118] Trad: More accurate trad From 4f444c1ea60d5a1270f5f2b44283cd92b425274e Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 29 Jul 2011 10:49:58 +0000 Subject: [PATCH 100/118] task #10501: Can use point of sale with different bank accounts --- htdocs/cashdesk/tpl/menu.tpl.php | 2 +- htdocs/cashdesk/tpl/validation1.tpl.php | 21 +++++++++++---------- htdocs/langs/ca_ES/cashdesk.lang | 4 +--- htdocs/langs/en_US/cashdesk.lang | 4 +--- htdocs/langs/es_ES/cashdesk.lang | 4 +--- htdocs/langs/fr_FR/cashdesk.lang | 4 +--- 6 files changed, 16 insertions(+), 23 deletions(-) diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 83dac68a99e..2ab0515e6ab 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -65,7 +65,7 @@ print '
                              '; print '
                                '; print '
                              • '.$langs->trans("NewSell").'
                                • '; -print '
                              • '.$langs->trans("BackOffice").'
                                • '; +print '
                              • '.$langs->trans("BackOffice").'
                                • '; print '
                              • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' '.$logout.'
                                '; print $langs->trans("CashDeskThirdParty").': '.$companyLink.'
                                '; diff --git a/htdocs/cashdesk/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/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang index 961d8193949..362ac317408 100755 --- a/htdocs/langs/ca_ES/cashdesk.lang +++ b/htdocs/langs/ca_ES/cashdesk.lang @@ -32,6 +32,4 @@ NoVAT=Sense IVA per aquesta venda Change=Canvi CalTip=Feu clic per veure el calendari CashDeskSetupStock=La configuració decrementa l'estoc en la creació de factures, però no ha indicat magatzem.
                                Canvieu la configuració del mòdul estoc, o esculli un magatzem -BankToPay=Compte de cobrament -ShowCompany=Veure empresa -ShowStock=Veure magatzem \ No newline at end of file +BankToPay=Compte de cobrament \ No newline at end of file diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index e335b0f7941..1b764a3aeda 100755 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -32,6 +32,4 @@ NoVAT=No VAT for this sale Change=Excess received CalTip=Click to view the calendar CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined
                                Change stock module setup, or choose a warehouse -BankToPay=Charge Account -ShowCompany=Show company -ShowStock=Show warehouse \ No newline at end of file +BankToPay=Charge Account \ No newline at end of file diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang index 0e2d2bcf390..e1ade767e8f 100755 --- a/htdocs/langs/es_ES/cashdesk.lang +++ b/htdocs/langs/es_ES/cashdesk.lang @@ -32,6 +32,4 @@ NoVAT=Sin IVA en esta venta Change=Cambio CalTip=Haga clic para ver el calendario CashDeskSetupStock=La configuración decrementa el stock en la creación de facturas, pero no ha indicado almacén.
                                Cambie la configuración del módulo stock, o escoja un almacén -BankToPay=Cuenta de cobro -ShowCompany=Ver empresa -ShowStock=Ver almacén \ No newline at end of file +BankToPay=Cuenta de cobro \ No newline at end of file diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang index 6e03cc886eb..692fb7ad834 100755 --- a/htdocs/langs/fr_FR/cashdesk.lang +++ b/htdocs/langs/fr_FR/cashdesk.lang @@ -32,6 +32,4 @@ NoVAT=Pas de TVA pour cette vente Change=Rendu CalTip=Cliquez pour afficher le calendrier CashDeskSetupStock=La configuration du module stock demande une réduction du stock sur facturation, mais vous n'avez pas spécifiez d'entrepôt. Vous devez modifier la configuration du module stock ou choisir un entrepôt. -BankToPay=Compte à créditer -ShowCompany=Voir société -ShowStock=Voir entrepôt \ No newline at end of file +BankToPay=Compte à créditer \ No newline at end of file From f004dc5310fc2531c236beade0e40b375f025eba Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 29 Jul 2011 10:50:16 +0000 Subject: [PATCH 101/118] task #10501: Can use point of sale with different bank accounts --- htdocs/cashdesk/validation_verif.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index 1afc2d54b02..0d679c15b84 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -14,7 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ require('../main.inc.php'); From 38912269e872e88010f67f4a0d81cccb18717cbc Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 29 Jul 2011 14:15:29 +0000 Subject: [PATCH 102/118] Fix: Missing translation Exit make a logout --- htdocs/cashdesk/tpl/menu.tpl.php | 2 +- htdocs/langs/ca_ES/cashdesk.lang | 4 +++- htdocs/langs/en_US/cashdesk.lang | 4 +++- htdocs/langs/es_ES/cashdesk.lang | 4 +++- htdocs/langs/fr_FR/cashdesk.lang | 4 +++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 2ab0515e6ab..83dac68a99e 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -65,7 +65,7 @@ print '
                                '; print '
                                  '; print '
                                • '.$langs->trans("NewSell").'
                                  • '; -print '
                                • '.$langs->trans("BackOffice").'
                                  • '; +print '
                                • '.$langs->trans("BackOffice").'
                                  • '; print '
                                • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' '.$logout.'
                                  '; print $langs->trans("CashDeskThirdParty").': '.$companyLink.'
                                  '; diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang index 362ac317408..961d8193949 100755 --- a/htdocs/langs/ca_ES/cashdesk.lang +++ b/htdocs/langs/ca_ES/cashdesk.lang @@ -32,4 +32,6 @@ NoVAT=Sense IVA per aquesta venda Change=Canvi CalTip=Feu clic per veure el calendari CashDeskSetupStock=La configuració decrementa l'estoc en la creació de factures, però no ha indicat magatzem.
                                  Canvieu la configuració del mòdul estoc, o esculli un magatzem -BankToPay=Compte de cobrament \ No newline at end of file +BankToPay=Compte de cobrament +ShowCompany=Veure empresa +ShowStock=Veure magatzem \ No newline at end of file diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index 1b764a3aeda..e335b0f7941 100755 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -32,4 +32,6 @@ NoVAT=No VAT for this sale Change=Excess received CalTip=Click to view the calendar CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined
                                  Change stock module setup, or choose a warehouse -BankToPay=Charge Account \ No newline at end of file +BankToPay=Charge Account +ShowCompany=Show company +ShowStock=Show warehouse \ No newline at end of file diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang index e1ade767e8f..0e2d2bcf390 100755 --- a/htdocs/langs/es_ES/cashdesk.lang +++ b/htdocs/langs/es_ES/cashdesk.lang @@ -32,4 +32,6 @@ NoVAT=Sin IVA en esta venta Change=Cambio CalTip=Haga clic para ver el calendario CashDeskSetupStock=La configuración decrementa el stock en la creación de facturas, pero no ha indicado almacén.
                                  Cambie la configuración del módulo stock, o escoja un almacén -BankToPay=Cuenta de cobro \ No newline at end of file +BankToPay=Cuenta de cobro +ShowCompany=Ver empresa +ShowStock=Ver almacén \ No newline at end of file diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang index 692fb7ad834..6e03cc886eb 100755 --- a/htdocs/langs/fr_FR/cashdesk.lang +++ b/htdocs/langs/fr_FR/cashdesk.lang @@ -32,4 +32,6 @@ NoVAT=Pas de TVA pour cette vente Change=Rendu CalTip=Cliquez pour afficher le calendrier CashDeskSetupStock=La configuration du module stock demande une réduction du stock sur facturation, mais vous n'avez pas spécifiez d'entrepôt. Vous devez modifier la configuration du module stock ou choisir un entrepôt. -BankToPay=Compte à créditer \ No newline at end of file +BankToPay=Compte à créditer +ShowCompany=Voir société +ShowStock=Voir entrepôt \ No newline at end of file From e5181d25c80a1e9c6c318a8d9508e05f9de35061 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 19:59:10 +0000 Subject: [PATCH 103/118] Fix: Missing key --- htdocs/install/mysql/migration/3.0.0-3.1.0.sql | 6 +++++- htdocs/install/mysql/tables/llx_product_fournisseur.key.sql | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql index cdc633ca281..e32055ea452 100755 --- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql +++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql @@ -1,5 +1,5 @@ -- --- $Id: 3.0.0-3.1.0.sql,v 1.83 2011/07/28 22:22:32 eldy Exp $ +-- $Id: 3.0.0-3.1.0.sql,v 1.84 2011/07/29 19:59:10 eldy Exp $ -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page @@ -131,6 +131,9 @@ ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_user FOR -- V4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_usergroup FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid); +-- V4.1 DELETE FROM llx_product_fournisseur where fk_product NOT IN (SELECT rowid from llx_product); +ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); + ALTER TABLE llx_commande ADD COLUMN ref_int varchar(30) AFTER ref_ext; ALTER TABLE llx_facture ADD COLUMN ref_int varchar(30) AFTER ref_ext; ALTER TABLE llx_societe ADD COLUMN ref_int varchar(60) AFTER ref_ext; @@ -480,3 +483,4 @@ ALTER TABLE llx_don ADD phone_mobile varchar(24) after email; ALTER TABLE llx_don ADD phone varchar(24) after email; ALTER TABLE llx_user ADD civilite varchar(6) after entity; + diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql index 8925d93d301..612755ce349 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2002-2004 Rodolphe Quiedeville --- Copyright (C) 2004-2005 Laurent Destailleur +-- Copyright (C) 2004-2011 Laurent Destailleur -- Copyright (C) 2005-2009 Regis Houssin -- -- This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_product_fournisseur.key.sql,v 1.2 2011/07/29 06:58:52 tiaris Exp $ +-- $Id: llx_product_fournisseur.key.sql,v 1.3 2011/07/29 19:59:33 eldy Exp $ -- ============================================================================ @@ -26,4 +26,4 @@ ALTER TABLE llx_product_fournisseur ADD UNIQUE INDEX uk_product_fournisseur_ref ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_product (fk_product, entity); ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_soc (fk_soc, entity); -ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); +ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); From f64c7e48672eeee841d6297855400537179c6961 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 20:47:34 +0000 Subject: [PATCH 104/118] Fix: Uniformize error management --- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/product/class/product.class.php | 244 +++++++++++-------------- 3 files changed, 119 insertions(+), 139 deletions(-) diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 0c262ba2936..5ba2ef8997e 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -385,5 +386,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 525160df9ef..9ee1f551048 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ + * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -607,5 +608,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index d6f7baf831e..1da2adb751e 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -25,7 +25,7 @@ * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.46 2011/07/29 06:59:36 tiaris Exp $ + * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); @@ -191,14 +191,15 @@ class Product extends CommonObject /** * Insert product into database - * @param user User making insert - * @return int id of product/service if OK or number of error < 0 + * @param user User making insert + * @param notrigger Disable triggers + * @return int Id of product/service if OK or number of error < 0 */ - function create($user) + function create($user,$notrigger=0) { - global $conf ; + global $conf, $langs; - $this->errno = 0; + $error=0; // Clean parameters $this->ref = dol_string_nospecial(trim($this->ref)); @@ -250,172 +251,149 @@ class Product extends CommonObject $this->error='ErrorWrongParameters'; return -1; } + if (empty($this->ref)) + { + $this->error='ErrorWrongParameters'; + return -2; + } dol_syslog("Product::Create ref=".$this->ref." price=".$this->price." price_ttc=".$this->price_ttc." tva_tx=".$this->tva_tx." price_base_type=".$this->price_base_type." Category : ".$this->catid, LOG_DEBUG); - if ($this->ref) + + $this->db->begin(); + + $sql = "SELECT count(*) as nb"; + $sql.= " FROM ".MAIN_DB_PREFIX."product"; + $sql.= " WHERE ref = '" .$this->ref."'"; + $sql.= " AND entity = ".$conf->entity; + + $result = $this->db->query($sql); + if ($result) { - $this->db->begin(); - - $sql = "SELECT count(*)"; - $sql.= " FROM ".MAIN_DB_PREFIX."product"; - $sql.= " WHERE ref = '" .$this->ref."'"; - $sql.= " AND entity = ".$conf->entity; - - $result = $this->db->query($sql) ; - if ($result) + $obj = $this->db->fetch_object($result); + if ($obj->nb == 0) { - $row = $this->db->fetch_array($result); - if ($row[0] == 0) + // Produit non deja existant + $sql = "INSERT INTO ".MAIN_DB_PREFIX."product ("; + $sql.= "datec"; + $sql.= ", entity"; + $sql.= ", ref"; + $sql.= ", price_min"; + $sql.= ", price_min_ttc"; + $sql.= ", label"; + $sql.= ", fk_user_author"; + $sql.= ", fk_product_type"; + $sql.= ", price"; + $sql.= ", price_ttc"; + $sql.= ", price_base_type"; + $sql.= ", tobuy"; + $sql.= ", tosell"; + $sql.= ", canvas"; + $sql.= ", finished"; + $sql.= ", hidden"; + $sql.= ") VALUES ("; + $sql.= $this->db->idate(mktime()); + $sql.= ", ".$conf->entity; + $sql.= ", '".$this->ref."'"; + $sql.= ", ".price2num($price_min_ht); + $sql.= ", ".price2num($price_min_ttc); + $sql.= ", ".($this->libelle?"'".$this->db->escape($this->libelle)."'":"null"); + $sql.= ", ".$user->id; + $sql.= ", ".$this->type; + $sql.= ", ".price2num($price_ht); + $sql.= ", ".price2num($price_ttc); + $sql.= ", '".$this->price_base_type."'"; + $sql.= ", ".$this->status; + $sql.= ", ".$this->status_buy; + $sql.= ", '".$this->canvas."'"; + $sql.= ", ".$this->finished; + $sql.= ", ".$this->hidden; + $sql.= ")"; + + dol_syslog("Product::Create sql=".$sql); + $result = $this->db->query($sql); + if ( $result ) { - // Produit non deja existant - $sql = "INSERT INTO ".MAIN_DB_PREFIX."product ("; - $sql.= "datec"; - $sql.= ", entity"; - $sql.= ", ref"; - $sql.= ", price_min"; - $sql.= ", price_min_ttc"; - $sql.= ", label"; - $sql.= ", fk_user_author"; - $sql.= ", fk_product_type"; - $sql.= ", price"; - $sql.= ", price_ttc"; - $sql.= ", price_base_type"; - $sql.= ", canvas"; - $sql.= ", finished"; - $sql.= ", hidden"; - $sql.= ") VALUES ("; - $sql.= $this->db->idate(mktime()); - $sql.= ", ".$conf->entity; - $sql.= ", '".$this->ref."'"; - $sql.= ", ".price2num($price_min_ht); - $sql.= ", ".price2num($price_min_ttc); - $sql.= ", ".($this->libelle?"'".$this->db->escape($this->libelle)."'":"null"); - $sql.= ", ".$user->id; - $sql.= ", ".$this->type; - $sql.= ", ".price2num($price_ht); - $sql.= ", ".price2num($price_ttc); - $sql.= ", '".$this->price_base_type."'"; - $sql.= ", '".$this->canvas."'"; - $sql.= ", ".$this->finished; - $sql.= ", ".$this->hidden; - $sql.= ")"; + $id = $this->db->last_insert_id(MAIN_DB_PREFIX."product"); - dol_syslog("Product::Create sql=".$sql); - $result = $this->db->query($sql); - if ( $result ) + if ($id > 0) { - $id = $this->db->last_insert_id(MAIN_DB_PREFIX."product"); + $this->id = $id; + $this->price = $price_ht; + $this->price_ttc = $price_ttc; + $this->price_min = $price_min_ht; + $this->price_min_ttc = $price_min_ttc; - if ($id > 0) + $result = $this->_log_price($user); + if ($result > 0) { - $this->id = $id; - $this->price = $price_ht; - $this->price_ttc = $price_ttc; - $this->price_min = $price_min_ht; - $this->price_min_ttc = $price_min_ttc; - - $result = $this->_log_price($user); - if ($result > 0) + if ( $this->update($id, $user) > 0) { - if ( $this->update($id, $user) > 0) + if ($this->catid > 0) { - if ($this->catid > 0) - { - require_once(DOL_DOCUMENT_ROOT ."/categories/class/categorie.class.php"); - $cat = new Categorie($this->db, $this->catid); - $cat->add_type($this,"product"); - } - } - else - { - $this->_setErrNo("Create",260,$this->error); + require_once(DOL_DOCUMENT_ROOT ."/categories/class/categorie.class.php"); + $cat = new Categorie($this->db, $this->catid); + $cat->add_type($this,"product"); } } else { - $this->error=$this->db->error(); - $this->_setErrNo("Create",264,$this->error); + $error++; + $this->error='ErrorFailedToUpdateRecord'; } } else { - $this->_setErrNo("Create",259); + $error++; + $this->error=$this->db->lasterror(); } } else { - $this->error=$this->db->error(); - $this->_setErrNo("Create",258,$this->error); + $error++; + $this->error='ErrorFailedToGetInsertedId'; } } else { - // Le produit existe deja - $this->error='ErrorProductAlreadyExists'; + $error++; + $this->error=$this->db->lasterror(); } } else { - $this->_setErrNo("Create",263); - } - - /* - * END COMMIT - */ - - if ($this->errno === 0) - { - // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); - $interface=new Interfaces($this->db); - $result=$interface->run_triggers('PRODUCT_CREATE',$this,$user,$langs,$conf); - if ($result < 0) { $error++; $this->errors=$interface->errors; } - // Fin appel triggers - - $this->db->commit(); - return $id; - } - else - { - $this->db->rollback(); - return -1; + // Product already exists with this ref + $langs->trans("Error")." : ".$langs->trans("ErrorProductAlreadyExists",$this->ref); } } else { - $this->_setErrNo("Create",262); - - return -2; + $error++; + $this->error=$this->db->lasterror(); } - return -1; + if (! $error && ! $notrigger) + { + // Appel des triggers + include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + $interface=new Interfaces($this->db); + $result=$interface->run_triggers('PRODUCT_CREATE',$this,$user,$langs,$conf); + if ($result < 0) { $error++; $this->errors=$interface->errors; } + // Fin appel triggers + } + + if (! $error) + { + $this->db->commit(); + return $this->id; + } + else + { + $this->db->rollback(); + return -$error; + } } - /** - * Positionne le numero d'erreur - * @param func Nom de la fonction - * @param num Numero de l'erreur - * @param error string - */ - function _setErrNo($func, $num, $error='') - { - $this->errno = $num; - dol_syslog(get_class($this)."::".$func." - ERRNO(".$this->errno.")".($error?' - '.$error:''), LOG_ERR); - } - - /** - * Retourne le texte de l'erreur - */ - function error() - { - $errs[257] = "ErrorProductAlreadyExists"; - $errs[262] = "ErrorProductBadRefOrLabel"; - - return $errs[$this->errno]; - } - - /** * Update a record into database * @param id Id of product @@ -2161,7 +2139,7 @@ class Product extends CommonObject $prods[$this->db->escape($rec['label'])][$keyChild] = $valueChild; } } - + return $prods; } else From 378daf51e8633b92033bb664df5c7f6c4163845b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 23:45:11 +0000 Subject: [PATCH 105/118] Fix: Avoid errors into rpm packages --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/control.DEBIAN | 46 + build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 - build/deb/install | 1 - build/deb/po/fr.po | 22 +- build/deb/po/templates.pot | 20 +- build/deb/postinst | 100 +- build/deb/postrm | 119 +- build/deb/templates | 7 - build/makepack-dolibarr.pl | 204 +++- dev/skeletons/modMyModule.class.php | 4 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 33 +- htdocs/admin/perms.php | 32 +- htdocs/boxes.php | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/validation_verif.php | 3 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/contrat/fiche.php | 6 +- htdocs/core/class/conf.class.php | 6 +- htdocs/core/class/translate.class.php | 7 +- htdocs/filefunc.inc.php | 7 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 +++++++++-------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/index.php | 7 +- htdocs/install/check.php | 5 +- htdocs/install/default.css | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 32 +- .../mysql/data/llx_20_c_departements.sql | 3 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/langs/es_ES/html/gpl.html | 330 ++++++ htdocs/langs/nl_BE/html/gpl.txt | 340 ++++++ htdocs/langs/nl_NL/html/gpl.txt | 339 ++++++ htdocs/lib/admin.lib.php | 77 +- htdocs/lib/ajax.lib.php | 5 +- htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 6 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- htdocs/societe/soc.php | 10 +- htdocs/theme/auguria/style.css.php | 5 +- .../smartphone/theme/default/default.css.php | 5 +- htdocs/user/group/perms.php | 34 +- htdocs/user/perms.php | 32 +- 336 files changed, 2806 insertions(+), 1603 deletions(-) create mode 100755 build/deb/control.DEBIAN create mode 100644 htdocs/langs/es_ES/html/gpl.html create mode 100644 htdocs/langs/nl_BE/html/gpl.txt create mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index d73d7a99219..edb46ffd5a3 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,13 +22,12 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build binary only package +# dpkg -b To build package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# dpkg-reconfigure -plow package Reconfigure package +# # dpkg -L packagename List content of installed package -# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index 3382966714b..b035f18ae1d 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 + -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN new file mode 100755 index 00000000000..7c66775bdf1 --- /dev/null +++ b/build/deb/control.DEBIAN @@ -0,0 +1,46 @@ +Package: dolibarr +Version: __VERSION__ +Architecture: all +Maintainer: Laurent Destailleur +Installed-Size: 61200 +Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Section: web +Priority: optional +Homepage: http://www.dolibarr.org +Description: Easy to use web based ERP & CRM software + Dolibarr ERP & CRM is an easy to use open source/free software for small + and medium companies, foundations or freelances. It includes different + features for Enterprise Resource Planning (ERP) and Customer Relationship + Management (CRM) but also for different other activities. + It's a web software you can install as a standalone program or on any web + hosting provider to use it from anywhere with any web browser. + Dolibarr was designed to provide only features you need and be easy to use. + . + Only features you need are visible, depending on which module were activated. + Most common used modules are: + . + Customers, Suppliers or Prospects directory, + Contacts directory, + Orders management, + Commercial proposals management, + Invoices management, + Products and services catalog, + Stock management, + Foundations members management, + Bank accounts management, + Point of Sale, + Payments management, + Commercial actions management, + Contracts management, + Standing orders management, + Shipping management, + Donations management, + Bookmarks management, + Mass Emailings, + Reports, + Wizards to export and import data, + LDAP connectivity, + PDF exports, + And a lot of more modules... + . + You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index e28258d8dbc..91f0705c001 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,16 +4,10 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper (>= 7), po-debconf +Build-Depends: debhelper, po-debconf Package: dolibarr -Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, - php5-mysql | php5-mysqli, - php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, - ${misc:Depends}, xdg-utils, - mysql-server, perl -Recommends: apache2 | lighttpd | httpd, mysql-client -Suggests: www-browser +Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl Architecture: all Section: web Priority: optional diff --git a/build/deb/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 b/build/deb/install index 2928d378abc..4d41fd52c65 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,5 +1,4 @@ etc/dolibarr/apache.conf -etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 3bbe762283a..13b8030ed0d 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:49+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,26 +25,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Seveur web à reconfigurer automatiquement:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"dolibarr." -msgstr "" -"Selectionnez le serveur web à configurer automatiquement pour utiliser " -"dolibarr." - # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -52,7 +36,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index d65e5d8b7f6..32c92a97cc4 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,29 +17,15 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"dolibarr." -msgstr "" - #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index e0bba1be4da..ca5fd1645dd 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,5 +1,7 @@ #!/bin/sh # postinst script for dolibarr +# +# see: dh_installdeb(1) set -e @@ -14,31 +16,6 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - - -lighttpd_install() { - if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - if which lighty-enable-mod >/dev/null 2>&1 ; then - echo "Add link for Lighttpd config file" - ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf - # We enabled it - lighty-enable-mod dolibarr fastcgi-php - else - echo "Lighttpd not installed, skipping" - fi - fi -} - -apache_install() { - webserver=$1 - if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Add link for Apache config file" - ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - . /usr/share/debconf/confmodule db_version 2.0 @@ -50,6 +27,8 @@ echo Run the dolibarr postinst script # Define vars docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" installconfig="/etc/dolibarr/install.forced.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php" @@ -65,6 +44,10 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir + # Copy apache.conf file into target directory + #mkdir -p /etc/dolibarr + #cp -p $apachefileorig $apacheconfig + # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -91,15 +74,21 @@ case "$1" in chmod -R 660 $config fi - - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - + # Get the web server type (use db_get for interactive mode). + #db_reset "dolibarr/webserver" + #db_get "dolibarr/webserver" # Read value for webserver. + #webserver="$RET" + + case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; + esac + # Set up web server. - for webserver in $webservers ; do - webserver=${webserver%,} - echo Complete config of server $webserver + for server in $webservers ; do + echo Complete config of server $server # Detect webuser and webgroup webuser= @@ -117,31 +106,26 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config + + # Add link to config file + echo Setup web server $server to add dolibarr config file + ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf + done - # Restart web server. - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_install - else - apache_install $webserver - fi - # Reload webserver in any case, configuration might have changed - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $webserver reload 3>/dev/null || true - else - echo Restart web server $server using $server reload - /etc/init.d/$webserver reload 3>/dev/null || true - fi - fi + # Restart servers + servers="apache2-ssl apache2 mysql" + # Another way to restart + for server in $servers ; do + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $server reload || true + else + echo Restart web server $server using $server reload + /etc/init.d/$server reload || true + fi done - echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -152,13 +136,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument $1" >&2 + echo "postinst called with unknown argument \`$1'" >&2 exit 0 ;; esac -#DEBHELPER# - db_stop +#DEBHELPER# + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 27ce3777b7e..9eae81b022b 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,36 +17,7 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - -lighttpd_remove() { - if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - echo "Remove link for Lighttpd config file" - rm -f /etc/lighttpd/conf-available/50-dolibarr.conf - if which lighty-enable-mod >/dev/null 2>&1 ; then - lighty-disable-mod dolibarr - else - echo "Lighttpd not installed, skipping" - fi - # See bug #448682 - if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then - echo 'Manually deleting lighttpd/dolibarr configuration link' - rm /etc/lighttpd/conf-enabled/50-dolibarr.conf - fi - fi -} - -apache_remove() { - if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Remove link for Apache config file" - rm -f /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule -fi +. /usr/share/debconf/confmodule db_version 2.0 @@ -55,62 +26,63 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" +export webserver="" +# Allows us to loop and substitute in one pass +case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; +esac + case "$1" in # Call when we upgrade upgrade) - echo "postrm upgrade" ;; # Call when we uninstall remove) - echo "postrm remove" rm -f $lockfile - # Reconfigure web server - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - - # Restart web servers - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_remove - else - apache_remove $webserver - fi - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $webserver reload 3>/dev/null || true - else - /etc/init.d/$webserver reload 3>/dev/null || true - fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete link $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge" + echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical dolibarr/postrm || true + db_input critical "dolibarr/postrm" || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get dolibarr/postrm + db_get "dolibarr/postrm" set -e if [ "$RET" = "true" ] ; then @@ -213,12 +185,41 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete file $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" + fi + done + rm -rf /etc/dolibarr + # Restart servers + for server in $restart ; do + # We disable blocking errors + set +e + echo "Restart server $server if exists" + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $server reload || true + else + /etc/init.d/$server reload || true + fi + # We restore blocking errors + set -e + done + # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset dolibarr/reconfigure-webserver - db_reset dolibarr/postrm + db_reset "dolibarr/postrm" set -e #db_purge @@ -228,7 +229,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument $1" >&2 + echo "postrm called with unknown argument \`$1'" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index b96325a4e64..5c06afd8ccd 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,10 +1,3 @@ -Template: dolibarr/reconfigure-webserver -Type: multiselect -Choices: apache2, lighttpd -_Description: Web server to reconfigure automatically: - Please choose the web server that should be automatically configured - to run dolibarr. - Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index f191d88c7f9..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.121 2011/07/28 23:05:13 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.121 $'; $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,6 +276,10 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mssql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`; @@ -291,11 +298,6 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`; $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; $ret=`rm -fr $BUILDROOT/$PROJECT/document`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`; @@ -306,6 +308,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; @@ -413,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"; @@ -438,16 +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/$PROJECT.tmp/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + # To remove once stable + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + + # Apache conf files + #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + + # Dolibarr conf files + # TODO + + # dolibarr.desktop + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; + #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; + #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; + + # pixmap + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; + #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; + #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; + + # Set owners + print "Set owners on files/dir\n"; + $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; + + print "Set permissions on files/dir\n"; + $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; + $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + + # Build tgz print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n"; $ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; @@ -475,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; } @@ -525,20 +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`; @@ -598,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`; @@ -652,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`; @@ -690,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; } 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/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/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/css/style.css b/htdocs/cashdesk/css/style.css index 698cceb4966..c79d46fbeb5 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,10 +11,11 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ +/* \version $Id$ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index 2d89cfd2388..f91946e11c0 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.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. */ // Instanciation et initialisation de l'objet xmlhttprequest diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index 0d679c15b84..1afc2d54b02 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ require('../main.inc.php'); diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 96de90124f9..259dc4dbce5 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -47,7 +48,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -66,7 +67,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -77,17 +78,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 5ba2ef8997e..0c262ba2936 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ */ require("./pre.inc.php"); @@ -386,5 +385,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); +llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 9ee1f551048..525160df9ef 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ */ require("./pre.inc.php"); @@ -608,5 +607,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); +llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); ?> diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 0efb704828f..e05eaa66ecf 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ + * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ */ require('../main.inc.php'); @@ -1031,5 +1032,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); +llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 5da397b4183..d2f2a7aae7e 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ + * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ */ require('../main.inc.php'); @@ -672,5 +673,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); +llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); ?> diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index b0145e14628..0cf91d64abc 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -23,7 +23,7 @@ * \file htdocs/contrat/fiche.php * \ingroup contrat * \brief Page of a contract - * \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $ + * \version $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $ */ require ("../main.inc.php"); @@ -757,7 +757,7 @@ else $var=!$var; - if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid) + if ($action != 'editline' || $_GET["rowid"] != $objp->rowid) { print ''; // Libelle @@ -1286,5 +1286,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $'); +llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index c5664164e74..acb0b5d9167 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -24,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ + * \version $Id: conf.class.php,v 1.63 2011/07/31 23:45:13 eldy Exp $ */ @@ -144,13 +144,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/translate.class.php b/htdocs/core/class/translate.class.php index 4496c18ff1f..bf30794f153 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -23,7 +23,7 @@ * \brief File for Tanslate class * \author Eric Seigne * \author Laurent Destailleur - * \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $ + * \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $ */ @@ -512,10 +512,9 @@ class Translate { * Return list of all available languages * @param langdir Directory to scan * @param maxlength Max length for each value in combo box (will be truncated) - * @param usecode Show code instead of country name for language variant * @return array List of languages */ - function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0) + function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0) { global $conf; @@ -528,7 +527,7 @@ class Translate { { $this->load("languages"); - if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE)) + if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE) { $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength); } diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 13a97bf54b3..3148174f5af 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,15 +20,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -65,7 +64,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 6f6c7ed2a1b..257b95e4e3c 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -64,7 +65,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.31 $'); + $ver=explode(' ','$Revision: 1.30 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 446606ef055..127eb16e389 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -63,7 +64,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
                              This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.28 $'); + $ver=explode(' ','$Revision: 1.27 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 46fa4c9ccc4..9c90d1fcc94 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,7 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program. If not, see . +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* or see http://www.gnu.org/ */ /** @@ -20,7 +22,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -59,7 +61,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
                              This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.14 $'); + $ver=explode(' ','$Revision$'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index 7055bef4b69..ec7e1af07c6 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ + * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/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/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index 067e831b0b4..b1e3f5a2638 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,503 +1,504 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index e5f0ff4c0e5..b1e3f5a2638 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,7 +484,8 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/index.php b/htdocs/index.php index 5998094d362..f027e94a35a 100644 --- a/htdocs/index.php +++ b/htdocs/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/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -574,7 +573,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); +llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 3724ef23d95..9b19d9793fc 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 1d2084e7c7f..9978c8f437a 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/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.24 2011/08/03 01:32:42 eldy Exp $ + * $Id$ */ body { diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 20ef1080e85..737e16cc10c 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 5d7fca530f2..c9713870c22 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index d7df4ac6929..e7b45a476f1 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 9a0dd0fcc43..62e0a4a90cf 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 0037190af06..50fa9904890 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ + * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 6d19b01e197..2e0fccb0051 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 3050d37833c..223a2eb6d92 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -75,10 +74,12 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +$lockfile = '../../install.lock'; +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; - +#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here +$lockfile = '../../install.lock'; if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -178,7 +179,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists('../../install.lock')) +if (file_exists($lockfile)) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
                              '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index c786f91346c..841136fff8b 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 275298588e2..9d08a56e41c 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,9 +17,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_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 1c43326d70f..1f046a29bc4 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ -- -- @@ -158,21 +158,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1); -- Regions Chile (id country=67) -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1); -- Regions San Salvador (id country=86) INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1); diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index e3963e8e68f..9a109ab3fdc 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ -- -- @@ -566,7 +566,6 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1); diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index da244f79951..56ceea3d807 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,9 +17,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_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index eee5dfa185a..3a248c2f49f 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,9 +18,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_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index e3922b97f65..dcbaf2faaf4 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,9 +17,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_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index b7f6c71c87e..1dd3cb59a62 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,9 +11,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_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index f3299990858..5e93e39d048 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,9 +17,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_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index 1f14cc8c142..e3ed8196d17 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,9 +17,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_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 5017ce0c60d..176e5c796e2 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,9 +17,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_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index f58db2b32a6..db630463dbf 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,9 +17,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_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index 079caa7dde4..c67d263853d 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,9 +17,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_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 4bb81528e74..07fa2abaa83 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,9 +18,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_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index 720413ac480..e29b3f306f5 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,9 +17,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_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index cb0b557b438..c7fa6b6dd1f 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.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_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index a3a19cc2125..6a597996424 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,9 +17,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_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 1ec498e6bc2..78e174b9817 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,9 +17,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_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a17978bb0c..3a535a5098e 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,9 +17,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_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index 96d456312df..f6395abbfcd 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,9 +17,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_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 488b0a564eb..9c28f697f83 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,9 +17,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_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index d8701c52c01..988d9c26136 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,9 +17,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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- @@ -33,4 +34,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2fd47385a90..2d1a3c62a39 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,9 +17,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_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index da98640fd25..4238000eb14 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,9 +17,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_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 789ad16fce2..6e596be24e5 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,9 +17,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_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index 48b77951e1f..e2faed3cba3 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,9 +17,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_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index 59bd3d1ef00..cf7e9e96275 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,9 +17,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_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index cd2f27a5dca..655848a50ae 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.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: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 42f86f1c447..968a131e2bb 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -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: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 685170362fd..6e6e960072b 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.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_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 921bc569980..02ff06ba9f1 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.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_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index d5902b539c7..f22262c9353 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.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_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index ddd3d734ff7..b2cdf08af5f 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.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_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 8c5c23bbe62..031bfb614e1 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -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: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index f7b876eed86..3aa9555979e 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -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: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 8d34e2a9c78..4703aa32ddd 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -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: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index ad6f448e3dc..69bf706ca68 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,9 +15,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_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 51d66c04584..9156b439833 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,9 +15,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_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index 7df7f21a3b9..db64e0cbf9c 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -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: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index 31676d7d6e2..a7efcbd0f6d 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -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: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index bc9d9ad0936..7e4fa074e71 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -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: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index 18eed730ab8..d23a1367f92 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index ade41da746e..2b2db5af657 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index 62a88236480..b5c9175202b 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 015a9e9b4c0..6ed1e00dd88 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index 296b49fc93f..d1279c21eb2 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 9cedf70e7ca..822a69bc4ec 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index 55718d8ffb5..aba765190ee 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.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_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index abc9baa2d8c..eded16c49fe 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -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: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index 3dd83585bcd..e39fbf71f12 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -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: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 217edcaddbb..3710a87470a 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -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: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index 5869f24d8bd..ad41449f288 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -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: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index 5db17f19069..f6301a24919 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index 5f66ff625f0..cd68a9cdb40 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index b0546729ef0..890c7597862 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.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_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index 4794113f8bd..d67cf7fe4b8 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -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: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5fc25f57339..5c06c73c69d 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 5746cce26aa..115bd310d70 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index ba1e56e2b94..d3c71cc4a70 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.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_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index de9c23e9c05..10c4cc2d853 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,10 +13,11 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, 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_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index cce9d04707b..09365976d78 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.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_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 93e8e3d99a7..463b1235094 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -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: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index b0f31fe7116..c81a2b3e830 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -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: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index cb2251cfaf6..821fe3e5c04 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -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: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 8bebcf13116..9380607010d 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index b30354cae19..e524d9c937a 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index b026a40d762..0b0b34390c4 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -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: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 39d21cee7b9..7b5fa661d7d 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -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: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index d1e6b216b4b..e2f225fe608 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.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_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 60af7723f30..66cd5111325 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -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: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index cb223ae5532..ebca12ab5da 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -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: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 415b8526793..3872bedd39d 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -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: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index 5c54695f608..bed4ad41dfc 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 93ef5d59770..23cd0f575ed 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index 7702a8cf21e..f46d2a56c33 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.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_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 46a35567e95..4669de108f4 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.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_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index c2c43a3a625..a6bb8ca70f7 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -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: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 547500d7f33..5637e5a987d 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -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: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index bf7ed18af80..884d8274cfd 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.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_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index d0dceaf0fe1..2b6dea6cbd3 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -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: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 192183be0c1..76aecebbb9a 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -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: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index d6d673962b9..665a210d74b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -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: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index c8deefef6d7..7fcd57e31eb 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -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: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index 757653f1fc2..e1cab3b3368 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -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: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f2fb7fda4d3..f97e458be6b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -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: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 7a228ec1572..165a8550331 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -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: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 120e27ae77d..6efa388ef81 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.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_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index a5e3fd8721b..c8824b2d04e 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.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_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 418e37a85b1..311183c87f4 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.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_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 1cc5dbfaf0e..2d00f620e02 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -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: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 84c72e0839b..02052920c8a 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -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: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 8cf0ec900f8..0f608cbc171 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.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_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 2eed307bc54..75b40946559 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.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_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index c977dd9dd21..76caf44356d 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 8307ca88eb6..861671e3607 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -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: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 9a7bda88c28..46504e8a1c4 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -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: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index 725ddbfeb90..dc284fc8cea 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -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: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index a1feeb33f8b..4f8736a3a14 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -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. -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -23,7 +24,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 1e141b7768a..85ea592d950 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -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: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 79d54faf623..9fad6cc333e 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -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: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index 97638937c74..d6bd27758b4 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -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: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 211af70a854..40759cdc50b 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.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_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 7c4c534451d..80e73c43399 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -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: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index f2330322a5f..4c466e0c02b 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -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: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 8e4492c28a9..46a39b3c9e7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -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: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 39be52cf374..60641bf1876 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -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: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index e93ce9b4354..cfe126b5adf 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.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_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index baa01289b96..7e12e06beb7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -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: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index bd19d25f1a5..83eb804c875 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -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: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index eb95b9fe66c..6236e113766 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -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: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index 2c95fde3255..cf5121c34f9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -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: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index d62011351c4..cabdcce3a80 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index a07ff049d61..ebaf9582414 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index 730bc11ac98..fa9a85aac1f 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -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: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index 6f129f2feec..ec8931763bf 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -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: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 172a2432ee1..7958b56f354 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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. -- --- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orphelins pour permettre mont�e de la cl� +-- Supprimme orphelins pour permettre monte de la cl -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index c13c0aa6019..3f848c9ffe2 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index f0c65456e5c..df6d49827f6 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index be4e60a9a97..9bb45f9d326 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -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: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 23cfd068495..91914ab66c7 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -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: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b18165255..d1b39863cab 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -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: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index 19ec675f973..e964fbc2f5e 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -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: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a53a24d9a66..a747c714fb3 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.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_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 46639ca7c1e..16ecb365d6c 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.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_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index d1ba0645e05..bfce896eb19 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.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_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index b7fc52403af..51234007ee1 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.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_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index 4187f526393..eead2907fa2 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,9 +15,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_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 7b74d8b506d..1c757fa6c86 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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. -- --- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orhpelins pour permettre mont�e de la cl� +-- Supprimme orhpelins pour permettre monte de la cl -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index f1f4a75b604..79b52ba399c 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -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: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 39b89773316..3757e4522bf 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -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: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index 98b29b1f715..f5987250001 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -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: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 0eb566317d0..9c4a5e340ab 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 3fb9f7d6d2d..906d0a3e2f4 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index ba595100b5f..20bb329ff0e 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index b71d2697b85..2063a310fb8 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index 61d63046fac..a99b42859c7 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -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: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index 0e20201f4cb..f0e0a065089 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.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_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 154f0b51006..06af8a78575 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.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_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1dc4941012a..1c5d5c30173 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -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: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index a208aa5fff0..e43f4cb118c 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -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: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index f60029ee290..e4eb41f3bb4 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.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_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 2833920b746..463675b10b7 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -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: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index 7987ca819c1..fc998bd6edb 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.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_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index e027d471e23..1e9b0495d34 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -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: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ +-- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index 8b279dc578b..b899c4303e1 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.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_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 684c5aa5a7c..5d6d86617e6 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -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: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index cdccf3eb6ec..6de1b23eb64 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.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_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index fee45753759..04491e0878c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -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: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 9401f679071..575930a728c 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -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: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 757e8d2b447..46b769b8afc 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.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_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index d0118ebdc6c..e1b82141ea1 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 57d92bc8ce9..19824c860de 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 6f2ddcf56b9..455916a3010 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.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_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 6cf13137710..94e726796c5 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.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_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index cee3ace0ec3..8dbbb572f29 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -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: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 34d0bbac03b..923c2441987 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.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_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index ef97e48a251..88cf83a3cc3 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -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: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index b674a0cf11d..68e21d26061 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -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: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index 5e3620cba87..f289b9cb514 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -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: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index bd3c0c7d780..a2e54d34770 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -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: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index 1524eb7a77b..dbeec277f88 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -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: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index 75a4ce8fd06..e3e5900fb74 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.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_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index eafe6bd31e1..0669065b7d3 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -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: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index 6a06c0c70b5..dcca0174817 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -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: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index d4aa4b26d99..99cf1edd744 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.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_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index b55d734674f..415b44c6a35 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -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: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index 22a5b9d5c52..ba8b40b3c0a 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -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: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 5edbea4808d..40e131fefdf 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,9 +15,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_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index 5313952606a..bc11ca42c8f 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -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: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index c210f906b9b..8d4a4ecdcbf 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,9 +15,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_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index 29598bb4963..f43ab1e746a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.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_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index cfaad1061df..a52d3ed4a8b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -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: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 521d666742d..4e9f0d1da0e 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -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: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index 29af17f7c08..c9891219f4f 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,9 +15,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_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 917d6fc5cdf..6b8f7176dee 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -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: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 87245438b4d..399dd175311 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,9 +15,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_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index 373267c8921..c06074d4709 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,9 +15,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_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index b67427b9de8..1e3f21d0eb7 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.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_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 8f00ee95200..08450aa204f 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -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: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index edc76a392b0..9b0104ccfe5 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.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_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 302248ae299..0782e089170 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -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: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 9c741080a27..68b6cd9a315 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 4dd0ae15ad4..177be65fb88 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index ffc0666074d..d573c90eb18 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -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: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index 96f122e59cd..e0b2c2494ad 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -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: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 4beccac04b8..92000240642 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -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: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 484cebf6a2a..6240a2ed5c0 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -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: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index a56201f7dba..e2c4be38a5f 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -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: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 84f6077e5ba..51e133a86dc 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.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_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index 46685416239..aab9c69c1a7 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -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: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index 1d41d1ab59e..dc9732c0719 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -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: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index d6dd854a240..663adaffe60 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -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: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 0b7d6a61f56..73dc6489461 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -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: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index c1ee00edd07..0b42446740b 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.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_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index d694d696801..7d728850185 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -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: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index 925ca9eee81..d062249c3b8 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f67337de388..f33c92ea7fe 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 8c8454fbc28..92f21a35f28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.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_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index 6c673570cfc..e62275df23d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -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: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 9c05ed97a8d..29ad3853f90 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Oc�bo +-- Copyright (C) 2005 Marc Barilley / Ocbo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -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: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b127b194fa5..b9ba378d81f 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -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: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 5c8ea94ed09..8771b0ddda8 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.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_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 94ba92d4856..8bb011f7280 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.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_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 4017ae32682..1aba5d286d1 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -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: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index 2c77ae3447c..e0c4fd61701 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -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: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 52c0a3e2a03..1e721e86788 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.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_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index 439b2a68098..d4ea3ad5535 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.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_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index f01b7d02e8e..6f8d6a8cf97 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -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: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index bd1e805aed2..854ec6e826e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.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_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index bfc2162ceca..f1e90520593 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.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_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 784e3d37507..15d3bda5ba2 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -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: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 029bc528b6e..66a61851cae 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,9 +15,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_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 9c066c54436..195d2464738 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.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_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index f4e38524d25..44a301a2db7 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -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: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index f03d92ce651..237b5c23030 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.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_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 2c9c2d929db..3bec7551161 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index d9e9ecd43a7..45845593162 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 01cabfec865..672374961d5 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -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: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index 696cf49c337..d8d9443595d 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -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: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index 170bd56f390..f21fed4d1af 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -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: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index 5a3d71b489a..a501b4db4b6 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -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: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index d29449c2503..41a91a9aa5f 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.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_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index 86f114d395b..e12dbc6fb12 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -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: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index ce320558709..1a83bee6508 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -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: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 76f76ff08ed..93a28593f8e 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -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: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index 133687c7466..ec2bb01863b 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -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: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 6ccd3aa39fb..552a985abd4 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -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: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index e24a8918c5b..63b28ac8410 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -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: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index 26e451271cb..e7ccde53858 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -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: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index 40b07d29305..a1619df5cb5 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -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: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index e21669e63d7..309c60b660f 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.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_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index d094512d975..c92472f7af5 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -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: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index a75fb9aa76d..3fb70995900 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,9 +15,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_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ +-- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index a0d88737e3f..e7fc66a0ed6 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.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_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 9e28a37d6bb..57b252ed2ea 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -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: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index 376447586c9..b8453ea821c 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.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_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index e7528a03f28..00268974476 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -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: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 4f994cf57aa..16bf4dea7f0 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.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_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index 1a7fdfd755f..eff6387abee 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,9 +15,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_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index a618e3d8790..f53599483a4 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -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: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index 902f2b4fd5f..b9643f019c3 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.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_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index 1f5500e2eb1..db4cdd2581c 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -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: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index c7d84e27326..6bf45f749f5 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 523eb3b37e0..7db41de673c 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index bf057b4ad75..8dc4636c87e 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -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: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index ade6a40a80d..d500fc1b7cb 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.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_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index bca670bbb98..a515ba541bf 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -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: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index 7481589df00..b742b82dafc 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -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: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index 4adaa1a56ff..fff909a0ec8 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -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: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index 16631c76b76..fb65e9b7e84 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -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: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 3df14473a7e..332b1305d38 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.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_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index c3958313ea3..ca4206eb6fc 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -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: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 910d2ab2072..68e1d4f20e9 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -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: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 5c7f2e9a59c..8714e7e4a07 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -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: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index cbaadb10091..7d3b0eecd98 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.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_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index e88665b5a34..8bdd7193d1a 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -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: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 86916c216a2..367d45e8525 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -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: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 23065b261c8..28b28aeb762 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -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: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index 3f58eaf698b..d78db14c30b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -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: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 18924ff6ac5..68e46fd120d 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.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_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 8056a150fc3..6acb2db4585 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.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_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 1b5ea5516d4..838f502bfdb 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -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: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index e61985c7dd1..f21099e9c5e 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -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: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index 7bf81b7fbe9..f771be5ef5a 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.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_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 1fb0d708dfa..0033bca36bc 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.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_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 6df43634ec4..8037c9cd7e5 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -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: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 7b6cbd91645..99234b6660f 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index 810781ed6d9..dca8e80f856 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index 2e89f083575..f3a58aa1433 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.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_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index fd656c736ef..98c56c37567 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -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: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 87f6416c6c5..100d9fe82b0 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -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: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- ============================================================================ CREATE LANGUAGE plpgsql; diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html new file mode 100644 index 00000000000..38e0f007a15 --- /dev/null +++ b/htdocs/langs/es_ES/html/gpl.html @@ -0,0 +1,330 @@ + + + + + + + + +H. Licencia Pública GNU + + + + + + + + + + + + + +

                              Licencia Pública GNU

                              + + + + +
                              + +GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 + +
                              + +

                              Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, + MA 02139, USA.

                              +

                              Está permitido, a cualquier persona, copiar y distribuir copias tal cual de + este documento de licencia, sin la introducción de cualquier cambio. +

                              + +
                              +

                              Introducción

                              +

                              Las licencias de muchos softwares se desarrollan para asegurar la libertad + de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, + al contrario, pretende garantizar la libertad de compartir y alterar softwares + de libre distribución - volviéndolos de libre distribución también para cualquier + de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares + de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla + (algunos softwares de la FSF son cubiertos por la GNU Library General Public + License).

                              +

                              Cuando nos referimos a softwares de libre distribución, nos referimos a la + libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar + la libertad de distribución de copias de softwares de libre distribución (y + cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos + fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se + hacen algunas restricciones, para asegurar los derechos de los programadores, + prohibiendo a todas las personas su negación o la solicitación de su abdicación. + Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución + o modificación del software.

                              +

                              Por ejemplo, al distribuirse copias de determinado programa, por una tasa + determinada o gratuitamente, se debe informar sobre todos los derechos incidentes + sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia + Pública General GNU.

                              +

                              La protección de los derechos envuelve dos pasos: (1) copyright del software + y (2) licencia que da permiso legal para copia, distribución y/o modificación + del softwares.

                              +

                              Aún para la protección de la FSF y del autor es importante que todos entiendan + que no hay garantías para softwares de libre distribución. Si software se modifica + por alguien y lo pasa adelante, este software no más reflejará el trabajo original + del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                              +

                              Finalmente, cualquier programa de libre distribución está constantemente amenazado + por las patentes de softwares. Buscamos evitar el peligro de que distribuidores + de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. + Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación + de patente se debe hacer permitiendo el uso por cualquier individuo, sin la + necesidad de licencia de uso.

                              +

                              Los términos y condiciones precisas para copia, distribución y modificación + siguen abajo:

                              +
                              +

                              Licencia Pública General GNU

                              +

                              TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN +

                              + +
                                + +

                              1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga + un aviso colocado por el detentor de los derechos de autor diciendo que aquel + podrá ser distribuido en las condiciones de la Licencia Pública General. El + Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado + en un Programa y significa tanto el propio Programa, como cualquier de los + trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, + un trabajo que contenga el Programa o una parte de este, en su forma original + o con modificaciones o traducido para una otra lengua (la traducción está + incluida sin limitaciones en el término ``modificación'').

                                +

                                Actividades distintas de copia, distribución y modificación no están cubiertas + por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa + no está restringido y la salida del Programa está cubierta solamente en + el caso de que su contenido contenga trabajos basados en el Programa (independientemente + de que hayan sido creados por la ejecución del Programa). Si esto es así, + depende de las funciones ejecutadas por el Programa.

                                2. + +

                              2. El código fuente del Programa, de la forma como fue recibido, puede ser + copiado y distribuido, en cualquier media, desde que sea providenciado un + aviso adecuado sobre los copyrights y la negación de garantías, y todos los + avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, + estén inalterados y que cualquier producto oriundo del Programa esté acompañado + de esta Licencia Pública General.

                                +

                                Está permitido el cobro de tasas por el acto físico de transferencia o + grabación de copias, y pueden ser dadas garantías y soporte en cambio del + cobro de valores.

                                3. + + +
                              3. +

                                Se puede modificar la copia o copias del Programa de cualquier forma que + se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir + tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                                + +
                                  +

                                1. Debe existir un aviso destacado de que los datos originales fueron alterados + en los archivos y las fechas de los cambios;

                                  2. + +

                                2. Debe existir un aviso de que el trabajo distribuido o publicado es, + de forma total o parcial, derivado del Programa o de alguna parte suya, + y que puede ser licenciado totalmente sin costes para terceros bajo los + términos de esta Licencia.

                                  3. + +

                                3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, + en el inicio de tu ejecución, presentar la información de copyright y + de ausencia de garantías (o de que la garantía es de responsabilidad de + terceros), y que los usuarios pueden redistribuir el programa bajo estas + condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                                  4. +
                                + + Estos requisitos se aplican a trabajos de modificación en general. Si + algunas secciones identificables no sean derivadas del Programa, y pueden + ser consideradas como partes independientes, entonces esta Licencia y sus + Términos no se aplican a aquellas secciones cuando distribuidas separadamente. + Pero al distribuir aquellas secciones como parte de un trabajo basado en + el Programa, la distribución, como un todo, debe contener los términos de + esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no + a cada una de las partes independientemente de quem los tenga desarrollado. + Más que tener intención de contestar los derechos sobre el trabajo desarrollado + por alguien, esta sección objetiva propiciar la correcta distribución de + trabajos derivados del Programa. + Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado + en él ni a un trabajo basado en él, a un volumen de almacenaje o media de + distribución no obliga la utilización de esta Licencia y de sus términos + al trabajo. +
                                4. + + +
                              4. +

                                Están permitidas, la copia y la distribución, del Programa (o un trabajo + basado en éste) en la forma de código objeto o ejecutable de acuerdo con los + términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                                + +
                                  +

                                1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos + en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada + para manejo de softwares o

                                  +
                                  2. +

                                2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, + de poner a disposición a terceros, por un coste no superior al coste del + medio físico de almacenaje, una copia completa de los códigos fuente en + medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                                  +
                                  3. +

                                3. Esté acompañada con la misma información recibida en relación con la + oferta de la distribución del código fuente correspondiente (esta alternativa + solamente está permitida para distribuciones no comerciales y solamente + si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, + de acuerdo con la sección 2 arriba).

                                  +
                                  4. +
                                + El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones + en aquel trabajo. Cuando se habla en códigos fuentes completos significa + hablar de todos los fuentes de todos los módulos, además de las definiciones + de interfaces asociadas, archivos, scripts utilizados en la compilación + y instalación del ejecutable. Como una excepción excepcional, el código + fuente distribuido podrá no incluir algunos componentes que no se encuentren + en su escopo, como compilador, kernel, etc... para el SO donde el trabajo + sea ejecutado. + Si la distribución del ejecutable o objeto se hace, a través de acceso + a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente + de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos + con los objetos simultáneamente +
                                5. + +
                              5. +

                                No está permitida la copia, modificación, sublicenciamiento o distribución + del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier + tentativa de copia, modificación, sublicenciamiento o distribución del Programa + está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. + Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, + no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas + de esta Licencia.

                                6. +
                              6. +

                                No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá + documento o contrato que garantice permiso de modificación o distribución + del Programa o sus trabajos derivados. Estas acciones están prohibidas por + ley, en el caso de que no se acepten las condiciones de esta Licencia. La + modificación o distribución del Programa, o cualquier trabajo basado en éste, + implica en la aceptación de esta Licencia y de todos los términos de ésta + para copia, distribución o modificación del Programa o trabajos basados en + éste.

                                7. +
                              7. +

                                Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), + el recipiente automáticamente recibe una licencia del detentor original de + los derechos de copia, distribución o modificación del Programa objeto de + estos términos y condiciones. No pueden ser impuestas otras restricciones + en los recipientes.

                                8. + +
                              8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes + o derechos de autor, se impongan restricciones, que contradigan esta Licencia, + estos no exentan de su aplicación. Si no es posible distribuir el Programa + de forma a garantizar simultáneamente las obligaciones de esta Licencia y + otras que sean necesarias, entonces el Programa no podrá ser distribuido. +

                                Si esta Sección se considera, inválida por cualquier motivo particular + o general, su resultado implicará en la invalidación general de esta licencia + en la copia, modificación, sublicenciamiento o distribución del Programa + o trabajos basados en éste.

                                +

                                El propósito de esta sección no es, de forma alguna, incitar a quien quiera + que sea a infringir derechos reclamados en cuestiones válidas y procedentes, + y si proteger las premisas del sistema de libre distribución de software. + Muchas personas tienen hecho contribuciones generosas al sistema, en la + forma de programas, y es necesario garantizar la consistencia y credibilidad + del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución + de los softwares.

                                +

                                Esta sección pretende hacer claro los motivos que crearan las demás cláusulas + de estas Licencia.

                                9. + +
                              9. +

                                Si la distribución del Programa, dentro de los términos de esta Licencia, + tiene restricciones en algún País, por patentes o derechos de autor, el detentor + original de los derechos de autor del Programa bajo esta Licencia puede adicionar + explícitamente limitaciones geográficas de distribución, excluyendo aquellos + Países, haciendo con que la distribución solamente sea posible en los Países + no excluidos.

                                10. + +
                              10. +

                                La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) + puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública + General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos + objetivos y el espirito de la presente versión, pudiendo variar en detalles + referentes a nuevas situaciones encontradas.

                                +

                                A cada versión se da un número distinto. Si el Programa especifica, un + número de versión determinado de esta Licencia, que tenga en su contenido + la expresión ``o versión más actualizada'', es posible optar por las condiciones + de aquella versión o de cualquier versión más actualizada publicada por + la FSF.

                                11. + +
                              11. +

                                Si deseas incorporar parte del Programa en otros programas de libre distribución + de softwares hace falta autorización formal del autor. Para softwares que + la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde + que mantenido el espirito y objetivos originales de esta Licencia.

                                12. +
                              + +

                              AUSENCIA DE GARANTÍAS

                              +
                                +

                              1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER + GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE + EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS + DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, + LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD + Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS + CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y + REPAROS JUZGADOS NECESARIOS.

                                2. +

                              2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR + LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN + RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE + HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS + O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES + O DAÑOS.

                                +

                                FIN DE LA LICENCIA

                              + + +
                              +

                               

                              +

                              Apéndice

                              +

                              ¿Cómo aplicar estos términos a nuevos softwares?

                              +

                              Si has desarrollado un nuevo programa y deseas su amplia distribución para + el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, + que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                              +

                              Para esto basta con anexar este aviso al programa. Se recomienda indicar aún + en el inicio de cada archivo fuente la ausencia de garantías y una anotación + de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                              +

                              <nombre del programa y función> Copyright (C) 199X <Autor> +

                              +

                              Este programa es un software de libre distribución, que puede ser copiado + y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo + con la publicada por la Free Software Foundation, versión 2 de la licencia o + (a criterio del autor) cualquier versión posterior.

                              +

                              Este programa se distribuye en la expectativa de ser útil a sus usuarios, + pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE + ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General + 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. +

                              +

                              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:

                              +

                              Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares + NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software + de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. + Teclea 'muestra condic' para mayores detalles.

                              +

                              Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las + partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos + pueden variar o pueden ser accionados por otras interfaces como clic de ratón, + etc...

                              +

                               

                              +
                              +
                              + +www.conectiva.com + +
                              + + + + + diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt new file mode 100644 index 00000000000..3efbe1ccee7 --- /dev/null +++ b/htdocs/langs/nl_BE/html/gpl.txt @@ -0,0 +1,340 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +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 new file mode 100644 index 00000000000..778e2b02b41 --- /dev/null +++ b/htdocs/langs/nl_NL/html/gpl.txt @@ -0,0 +1,339 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van +deze licentie. \ No newline at end of file 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/ajax.lib.php b/htdocs/lib/ajax.lib.php index 7db1908bc49..55def736688 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ */ diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 49b67f9349a..1bdeb9562e6 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index eedd6a8841c..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/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index d6bf7267439..454073d9730 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 6e1e7b262f4..b5304ba4198 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index b0a7c2dece6..bda35165079 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.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/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ + * \version $Id$ */ if (session_id() == "") session_start(); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1da2adb751e..8bccf934120 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index a65f888ab11..efbd289cb3f 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ */ require("../main.inc.php"); @@ -1646,6 +1645,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); +llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 79601ea1031..8f373b577e8 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 8cf57ec0b64..724900dc500 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ + * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ */ require("../main.inc.php"); @@ -272,5 +271,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); +llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); ?> 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/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 78ca25e85a6..edb62d728d5 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $ + * \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index e78dff8f646..f93935ffb16 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.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/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ + * \version $Id$ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal 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 $'); ?> From a79728805939e6036b9b2834d4942550aadf8b6d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 20:55:19 +0000 Subject: [PATCH 106/118] Fix: Trans --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/control.DEBIAN | 46 - build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 + build/deb/install | 1 + build/deb/po/fr.po | 22 +- build/deb/po/templates.pot | 20 +- build/deb/postinst | 100 +- build/deb/postrm | 119 +- build/deb/templates | 7 + build/makepack-dolibarr.pl | 204 +--- dev/skeletons/modMyModule.class.php | 4 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 35 +- htdocs/admin/perms.php | 34 +- htdocs/boxes.php | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/validation_verif.php | 3 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/contrat/fiche.php | 6 +- htdocs/core/class/conf.class.php | 6 +- htdocs/core/class/translate.class.php | 7 +- htdocs/filefunc.inc.php | 7 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 ++++++++--------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/index.php | 7 +- htdocs/install/check.php | 5 +- htdocs/install/default.css | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 32 +- .../mysql/data/llx_20_c_departements.sql | 3 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/langs/es_ES/html/gpl.html | 330 ------ htdocs/langs/nl_BE/html/gpl.txt | 340 ------ htdocs/langs/nl_NL/html/gpl.txt | 339 ------ htdocs/lib/admin.lib.php | 77 +- htdocs/lib/ajax.lib.php | 5 +- htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 6 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- htdocs/societe/soc.php | 10 +- htdocs/theme/auguria/style.css.php | 5 +- .../smartphone/theme/default/default.css.php | 5 +- htdocs/user/group/perms.php | 34 +- htdocs/user/perms.php | 32 +- 336 files changed, 1605 insertions(+), 2808 deletions(-) delete mode 100755 build/deb/control.DEBIAN delete mode 100644 htdocs/langs/es_ES/html/gpl.html delete mode 100644 htdocs/langs/nl_BE/html/gpl.txt delete mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index edb46ffd5a3..d73d7a99219 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build package +# dpkg -b To build binary only package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# +# dpkg-reconfigure -plow package Reconfigure package # dpkg -L packagename List content of installed package +# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index b035f18ae1d..3382966714b 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 + -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN deleted file mode 100755 index 7c66775bdf1..00000000000 --- a/build/deb/control.DEBIAN +++ /dev/null @@ -1,46 +0,0 @@ -Package: dolibarr -Version: __VERSION__ -Architecture: all -Maintainer: Laurent Destailleur -Installed-Size: 61200 -Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl -Section: web -Priority: optional -Homepage: http://www.dolibarr.org -Description: Easy to use web based ERP & CRM software - Dolibarr ERP & CRM is an easy to use open source/free software for small - and medium companies, foundations or freelances. It includes different - features for Enterprise Resource Planning (ERP) and Customer Relationship - Management (CRM) but also for different other activities. - It's a web software you can install as a standalone program or on any web - hosting provider to use it from anywhere with any web browser. - Dolibarr was designed to provide only features you need and be easy to use. - . - Only features you need are visible, depending on which module were activated. - Most common used modules are: - . - Customers, Suppliers or Prospects directory, - Contacts directory, - Orders management, - Commercial proposals management, - Invoices management, - Products and services catalog, - Stock management, - Foundations members management, - Bank accounts management, - Point of Sale, - Payments management, - Commercial actions management, - Contracts management, - Standing orders management, - Shipping management, - Donations management, - Bookmarks management, - Mass Emailings, - Reports, - Wizards to export and import data, - LDAP connectivity, - PDF exports, - And a lot of more modules... - . - You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index 91f0705c001..e28258d8dbc 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,10 +4,16 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper, po-debconf +Build-Depends: debhelper (>= 7), po-debconf Package: dolibarr -Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, + php5-mysql | php5-mysqli, + php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, + ${misc:Depends}, xdg-utils, + mysql-server, perl +Recommends: apache2 | lighttpd | httpd, mysql-client +Suggests: www-browser Architecture: all Section: web Priority: optional diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index a48e5048dff..f4b471edf13 100644 --- a/build/deb/dolibarr.desktop +++ b/build/deb/dolibarr.desktop @@ -3,10 +3,14 @@ # It must be saved into directory /usr/share/applications Version=1.0 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM +Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations +Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/deb/install b/build/deb/install index 4d41fd52c65..2928d378abc 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,4 +1,5 @@ etc/dolibarr/apache.conf +etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 13b8030ed0d..3bbe762283a 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:49+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,10 +25,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "Seveur web à reconfigurer automatiquement:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" +"Selectionnez le serveur web à configurer automatiquement pour utiliser " +"dolibarr." + # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -36,7 +52,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index 32c92a97cc4..d65e5d8b7f6 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:52+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,15 +17,29 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: multiselect #. Description #: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:2001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index ca5fd1645dd..e0bba1be4da 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,7 +1,5 @@ #!/bin/sh # postinst script for dolibarr -# -# see: dh_installdeb(1) set -e @@ -16,6 +14,31 @@ set -e # for details, see /usr/share/doc/packaging-manual/ + + +lighttpd_install() { + if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + if which lighty-enable-mod >/dev/null 2>&1 ; then + echo "Add link for Lighttpd config file" + ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf + # We enabled it + lighty-enable-mod dolibarr fastcgi-php + else + echo "Lighttpd not installed, skipping" + fi + fi +} + +apache_install() { + webserver=$1 + if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Add link for Apache config file" + ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + . /usr/share/debconf/confmodule db_version 2.0 @@ -27,8 +50,6 @@ 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" @@ -44,10 +65,6 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir - # Copy apache.conf file into target directory - #mkdir -p /etc/dolibarr - #cp -p $apachefileorig $apacheconfig - # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -74,21 +91,15 @@ case "$1" in chmod -R 660 $config fi - # Get the web server type (use db_get for interactive mode). - #db_reset "dolibarr/webserver" - #db_get "dolibarr/webserver" # Read value for webserver. - #webserver="$RET" - - case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; - esac - + + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + # Set up web server. - for server in $webservers ; do - echo Complete config of server $server + for webserver in $webservers ; do + webserver=${webserver%,} + echo Complete config of server $webserver # Detect webuser and webgroup webuser= @@ -106,26 +117,31 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config - - # Add link to config file - echo Setup web server $server to add dolibarr config file - ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf - done - # Restart servers - servers="apache2-ssl apache2 mysql" - # Another way to restart - for server in $servers ; do - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $server reload || true - else - echo Restart web server $server using $server reload - /etc/init.d/$server reload || true - fi + # Restart web server. + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_install + else + apache_install $webserver + fi + # Reload webserver in any case, configuration might have changed + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $webserver reload 3>/dev/null || true + else + echo Restart web server $server using $server reload + /etc/init.d/$webserver reload 3>/dev/null || true + fi + fi done + echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -136,13 +152,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument $1" >&2 exit 0 ;; esac -db_stop - #DEBHELPER# +db_stop + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 9eae81b022b..27ce3777b7e 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,7 +17,36 @@ set -e # for details, see /usr/share/doc/packaging-manual/ -. /usr/share/debconf/confmodule + +lighttpd_remove() { + if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + echo "Remove link for Lighttpd config file" + rm -f /etc/lighttpd/conf-available/50-dolibarr.conf + if which lighty-enable-mod >/dev/null 2>&1 ; then + lighty-disable-mod dolibarr + else + echo "Lighttpd not installed, skipping" + fi + # See bug #448682 + if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then + echo 'Manually deleting lighttpd/dolibarr configuration link' + rm /etc/lighttpd/conf-enabled/50-dolibarr.conf + fi + fi +} + +apache_remove() { + if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Remove link for Apache config file" + rm -f /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi db_version 2.0 @@ -26,63 +55,62 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' -apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" -apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" -export webserver="" -# Allows us to loop and substitute in one pass -case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; -esac - case "$1" in # Call when we upgrade upgrade) + echo "postrm upgrade" ;; # Call when we uninstall remove) + echo "postrm remove" rm -f $lockfile - # 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" + # Reconfigure web server + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + + # Restart web servers + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_remove + else + apache_remove $webserver + fi + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload 3>/dev/null || true + else + /etc/init.d/$webserver reload 3>/dev/null || true + fi fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" + echo "postrm purge" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical "dolibarr/postrm" || true + db_input critical dolibarr/postrm || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get "dolibarr/postrm" + db_get dolibarr/postrm set -e if [ "$RET" = "true" ] ; then @@ -185,41 +213,12 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi - # Remove include files - export restart="" - for server in $webservers ; do - export conffile="/etc/$server/conf.d/dolibarr.conf" - if [ -f $conffile ] ; - then - echo Delete file $conffile - rm -f $conffile - status=purge - fi - - if [ "x$status" = "xpurge" ] ; - then restart="$restart $server" - fi - done - rm -rf /etc/dolibarr - # Restart servers - for server in $restart ; do - # We disable blocking errors - set +e - echo "Restart server $server if exists" - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $server reload || true - else - /etc/init.d/$server reload || true - fi - # We restore blocking errors - set -e - done - # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset "dolibarr/postrm" + db_reset dolibarr/reconfigure-webserver + db_reset dolibarr/postrm set -e #db_purge @@ -229,7 +228,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "postrm called with unknown argument $1" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index 5c06afd8ccd..b96325a4e64 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,3 +1,10 @@ +Template: dolibarr/reconfigure-webserver +Type: multiselect +Choices: apache2, lighttpd +_Description: Web server to reconfigure automatically: + Please choose the web server that should be automatically configured + to run dolibarr. + Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index d3c47e6b28d..f191d88c7f9 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.128 2011/07/31 22:08:13 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.121 2011/07/28 23:05:13 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -11,7 +11,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="1"; -$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="auto"; # auto use value found into BUILD @LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.121 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -254,18 +254,15 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliW*-*`; $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliM*-*`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.changes`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`; $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`; @@ -276,10 +273,6 @@ 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`; @@ -298,6 +291,11 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`; $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; $ret=`rm -fr $BUILDROOT/$PROJECT/document`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`; @@ -308,7 +306,6 @@ 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`; @@ -416,19 +413,14 @@ if ($nboftargetok) { } if ($target eq 'RPM') { # Linux only - #$ARCH='i386'; - $ARCH='noarch'; + $ARCH='i386'; if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; } $newbuild = $BUILD; - # For fedora - $newbuild =~ s/(dev|alpha)/0.1.a/gi; # dev - $newbuild =~ s/beta/0.2.beta1/gi; # beta - $newbuild =~ s/rc./0.3.rc1/gi; # rc + $newbuild =~ s/(dev|alpha)/0/gi; # dev + $newbuild =~ s/beta/1/gi; # beta + $newbuild =~ s/rc./2/gi; # rc if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale - #$newbuild =~ s/(dev|alpha)/0/gi; # dev - #$newbuild =~ s/beta/1/gi; # beta - #$newbuild =~ s/rc./2/gi; # rc - #if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale + # now newbuild is 0-0 or 0-3 for example $REL1 = $newbuild; $REL1 =~ s/-.*$//gi; if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; } print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; @@ -446,93 +438,16 @@ 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 -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$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`; @@ -560,10 +475,6 @@ 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; } @@ -614,33 +525,20 @@ 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`; @@ -700,7 +598,17 @@ if ($nboftargetok) { print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`; - # Set owners + #print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n"; + #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`; + + # copyright (to build binary package directly without sources. Useless if we build from sources) + #print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n"; + #$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`; + + # changelog (to build binary package directly without sources. Useless if we build from sources) + #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`; + #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`; + print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`; @@ -744,25 +652,29 @@ 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=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`; + $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"`; # 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`; @@ -778,18 +690,12 @@ if ($nboftargetok) { if ($OS =~ /windows/i) { print "Move *_all.deb to $DESTI\n"; - $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; - $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; - $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; - $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; + $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; } else { print "Move *_all.deb to $DESTI\n"; - $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; - $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; - $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; - $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; + $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; } next; } diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 3cc548e1c0a..d7172d651f0 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -27,7 +27,7 @@ * \file htdocs/includes/modules/modMyModule.class.php * \ingroup mymodule * \brief Description and activation file for module MyModule - * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $ + * \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); @@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='generic'; - // Defined if the directory /mymodule/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 718c842d046..34e7f48cea8 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -20,7 +20,7 @@ /** * \file htdocs/admin/boxes.php * \brief Page to setup boxes - * \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $ */ require("../main.inc.php"); @@ -278,7 +278,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -394,7 +394,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -470,5 +470,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $'); +llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $'); ?> diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index a907f47663a..671bd69a0e4 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2010 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ /** * \file htdocs/admin/modules.php * \brief Page to activate/disable all modules - * \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $ */ require("../main.inc.php"); @@ -79,12 +79,35 @@ $modules = array(); $orders = array(); $categ = array(); $dirmod = array(); +$modulesdir = array(); $i = 0; // is a sequencer of modules found $j = 0; // j is module number. Automatically affected if module number not defined. -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $althandle=@opendir($dirroot); + if (is_resource($althandle)) + { + while (($file = readdir($althandle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                              "; dol_syslog("Scan directory ".$dir." for modules"); @@ -449,5 +472,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $'); +llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $'); ?> diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index bee00b52906..6af9b54e7f0 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -21,7 +21,7 @@ * \file htdocs/admin/perms.php * \ingroup core * \brief Page d'administration/configuration des permissions par defaut - * \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $ + * \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $ */ require("../main.inc.php"); @@ -76,10 +76,34 @@ $db->begin(); // Charge les modules soumis a permissions $modules = array(); -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +$modulesdir = array(); +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                              "; $handle=@opendir($dir); @@ -194,5 +218,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $'); +llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $'); ?> diff --git a/htdocs/boxes.php b/htdocs/boxes.php index 2affdf654d3..d426e618377 100644 --- a/htdocs/boxes.php +++ b/htdocs/boxes.php @@ -22,7 +22,7 @@ * \brief File of class to manage widget boxes * \author Rodolphe Qiedeville * \author Laurent Destailleur - * \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $ */ @@ -220,7 +220,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php"); + $sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); } else { @@ -281,7 +281,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index c79d46fbeb5..698cceb4966 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,11 +11,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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ -/* \version $Id$ */ +/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index f91946e11c0..2d89cfd2388 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.js @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ // Instanciation et initialisation de l'objet xmlhttprequest diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index 1afc2d54b02..0d679c15b84 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -14,7 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ require('../main.inc.php'); diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 259dc4dbce5..96de90124f9 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -48,7 +47,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -67,7 +66,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -78,17 +77,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 0c262ba2936..5ba2ef8997e 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -385,5 +386,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 525160df9ef..9ee1f551048 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ + * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -607,5 +608,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index e05eaa66ecf..0efb704828f 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ + * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -1032,5 +1031,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index d2f2a7aae7e..5da397b4183 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ + * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ */ require('../main.inc.php'); @@ -673,5 +672,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); +llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); ?> diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 0cf91d64abc..b0145e14628 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -23,7 +23,7 @@ * \file htdocs/contrat/fiche.php * \ingroup contrat * \brief Page of a contract - * \version $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $ + * \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $ */ require ("../main.inc.php"); @@ -757,7 +757,7 @@ else $var=!$var; - if ($action != 'editline' || $_GET["rowid"] != $objp->rowid) + if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid) { print ''; // Libelle @@ -1286,5 +1286,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $'); +llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index acb0b5d9167..c5664164e74 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -24,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.63 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ */ @@ -144,13 +144,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard + $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard + $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/'; } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index bf30794f153..4496c18ff1f 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -23,7 +23,7 @@ * \brief File for Tanslate class * \author Eric Seigne * \author Laurent Destailleur - * \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $ + * \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $ */ @@ -512,9 +512,10 @@ class Translate { * Return list of all available languages * @param langdir Directory to scan * @param maxlength Max length for each value in combo box (will be truncated) + * @param usecode Show code instead of country name for language variant * @return array List of languages */ - function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0) + function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0) { global $conf; @@ -527,7 +528,7 @@ class Translate { { $this->load("languages"); - if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE) + if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE)) { $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength); } diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 3148174f5af..13a97bf54b3 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,14 +20,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -64,7 +65,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 257b95e4e3c..6f6c7ed2a1b 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -65,7 +64,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.30 $'); + $ver=explode(' ','$Revision: 1.31 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 127eb16e389..446606ef055 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -64,7 +63,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
                              This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.27 $'); + $ver=explode(' ','$Revision: 1.28 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 9c90d1fcc94..46fa4c9ccc4 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,9 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* or see http://www.gnu.org/ +* along with this program. If not, see . */ /** @@ -22,7 +20,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id$ + * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -61,7 +59,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
                              This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision$'); + $ver=explode(' ','$Revision: 1.14 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index ec7e1af07c6..7055bef4b69 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php index 42780551928..c7bab37ad4b 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.10 2011/07/31 23:28:10 eldy Exp $ + * \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis 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/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 1; // Data directories to create when module is enabled diff --git a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index b1e3f5a2638..067e831b0b4 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,504 +1,503 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; If not, see . + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index b1e3f5a2638..e5f0ff4c0e5 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + License along with this library; If not, see . Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/index.php b/htdocs/index.php index f027e94a35a..5998094d362 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -573,7 +574,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); +llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9b19d9793fc..3724ef23d95 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 9978c8f437a..1d2084e7c7f 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: default.css,v 1.24 2011/08/03 01:32:42 eldy Exp $ */ body { diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 737e16cc10c..20ef1080e85 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ + * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index c9713870c22..5d7fca530f2 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index e7b45a476f1..d7df4ac6929 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 62e0a4a90cf..9a0dd0fcc43 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ + * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 50fa9904890..0037190af06 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 2e0fccb0051..6d19b01e197 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ + * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 223a2eb6d92..3050d37833c 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -74,12 +75,10 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -$lockfile = '../../install.lock'; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; -#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here -$lockfile = '../../install.lock'; + if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -179,7 +178,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists($lockfile)) +if (file_exists('../../install.lock')) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
                              '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index 841136fff8b..c786f91346c 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ + * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 9d08a56e41c..275298588e2 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 1f046a29bc4..1c43326d70f 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $ -- -- @@ -158,21 +158,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1); -- Regions Chile (id country=67) -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1); -- Regions San Salvador (id country=86) INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1); diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 9a109ab3fdc..e3963e8e68f 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $ -- -- @@ -566,6 +566,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1); +INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1); diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index 56ceea3d807..da244f79951 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index 3a248c2f49f..eee5dfa185a 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index dcbaf2faaf4..e3922b97f65 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index 1dd3cb59a62..b7f6c71c87e 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,10 +11,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index 5e93e39d048..f3299990858 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index e3ed8196d17..1f14cc8c142 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 176e5c796e2..5017ce0c60d 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index db630463dbf..f58db2b32a6 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index c67d263853d..079caa7dde4 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 07fa2abaa83..4bb81528e74 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index e29b3f306f5..720413ac480 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index c7fa6b6dd1f..cb0b557b438 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index 6a597996424..a3a19cc2125 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 78e174b9817..1ec498e6bc2 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a535a5098e..3a17978bb0c 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index f6395abbfcd..96d456312df 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 9c28f697f83..488b0a564eb 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index 988d9c26136..d8701c52c01 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ -- -- @@ -34,4 +33,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2d1a3c62a39..2fd47385a90 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index 4238000eb14..da98640fd25 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 6e596be24e5..789ad16fce2 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index e2faed3cba3..48b77951e1f 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index cf7e9e96275..59bd3d1ef00 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index 655848a50ae..cd2f27a5dca 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 968a131e2bb..42f86f1c447 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 6e6e960072b..685170362fd 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 02ff06ba9f1..921bc569980 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index f22262c9353..d5902b539c7 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index b2cdf08af5f..ddd3d734ff7 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 031bfb614e1..8c5c23bbe62 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index 3aa9555979e..f7b876eed86 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 4703aa32ddd..8d34e2a9c78 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index 69bf706ca68..ad6f448e3dc 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 9156b439833..51d66c04584 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index db64e0cbf9c..7df7f21a3b9 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index a7efcbd0f6d..31676d7d6e2 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index 7e4fa074e71..bc9d9ad0936 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index d23a1367f92..18eed730ab8 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index 2b2db5af657..ade41da746e 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index b5c9175202b..62a88236480 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 6ed1e00dd88..015a9e9b4c0 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index d1279c21eb2..296b49fc93f 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 822a69bc4ec..9cedf70e7ca 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index aba765190ee..55718d8ffb5 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index eded16c49fe..abc9baa2d8c 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index e39fbf71f12..3dd83585bcd 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 3710a87470a..217edcaddbb 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index ad41449f288..5869f24d8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index f6301a24919..5db17f19069 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index cd68a9cdb40..5f66ff625f0 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index 890c7597862..b0546729ef0 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index d67cf7fe4b8..4794113f8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5c06c73c69d..5fc25f57339 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 115bd310d70..5746cce26aa 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index d3c71cc4a70..ba1e56e2b94 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index 10c4cc2d853..de9c23e9c05 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,11 +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, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- --- $Id$ +-- $Id: llx_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index 09365976d78..cce9d04707b 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 463b1235094..93e8e3d99a7 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index c81a2b3e830..b0f31fe7116 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index 821fe3e5c04..cb2251cfaf6 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 9380607010d..8bebcf13116 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index e524d9c937a..b30354cae19 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index 0b0b34390c4..b026a40d762 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 7b5fa661d7d..39d21cee7b9 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index e2f225fe608..d1e6b216b4b 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 66cd5111325..60af7723f30 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index ebca12ab5da..cb223ae5532 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 3872bedd39d..415b8526793 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index bed4ad41dfc..5c54695f608 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 23cd0f575ed..93ef5d59770 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index f46d2a56c33..7702a8cf21e 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 4669de108f4..46a35567e95 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index a6bb8ca70f7..c2c43a3a625 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 5637e5a987d..547500d7f33 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index 884d8274cfd..bf7ed18af80 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index 2b6dea6cbd3..d0dceaf0fe1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 76aecebbb9a..192183be0c1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index 665a210d74b..d6d673962b9 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index 7fcd57e31eb..c8deefef6d7 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index e1cab3b3368..757653f1fc2 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f97e458be6b..f2fb7fda4d3 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 165a8550331..7a228ec1572 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 6efa388ef81..120e27ae77d 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index c8824b2d04e..a5e3fd8721b 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 311183c87f4..418e37a85b1 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 2d00f620e02..1cc5dbfaf0e 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 02052920c8a..84c72e0839b 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 0f608cbc171..8cf0ec900f8 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 75b40946559..2eed307bc54 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index 76caf44356d..c977dd9dd21 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 861671e3607..8307ca88eb6 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 46504e8a1c4..9a7bda88c28 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index dc284fc8cea..725ddbfeb90 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index 4f8736a3a14..a1feeb33f8b 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -13,8 +13,7 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -24,7 +23,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 85ea592d950..1e141b7768a 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 9fad6cc333e..79d54faf623 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index d6bd27758b4..97638937c74 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 40759cdc50b..211af70a854 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 80e73c43399..7c4c534451d 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index 4c466e0c02b..f2330322a5f 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 46a39b3c9e7..8e4492c28a9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 60641bf1876..39be52cf374 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index cfe126b5adf..e93ce9b4354 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index 7e12e06beb7..baa01289b96 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index 83eb804c875..bd19d25f1a5 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index 6236e113766..eb95b9fe66c 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index cf5121c34f9..2c95fde3255 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index cabdcce3a80..d62011351c4 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index ebaf9582414..a07ff049d61 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index fa9a85aac1f..730bc11ac98 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index ec8931763bf..6f129f2feec 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 7958b56f354..172a2432ee1 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ --- Supprimme orphelins pour permettre monte de la cl +-- Supprimme orphelins pour permettre mont�e de la cl� -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index 3f848c9ffe2..c13c0aa6019 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index df6d49827f6..f0c65456e5c 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index 9bb45f9d326..be4e60a9a97 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 91914ab66c7..23cfd068495 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b39863cab..d1b18165255 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index e964fbc2f5e..19ec675f973 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a747c714fb3..a53a24d9a66 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 16ecb365d6c..46639ca7c1e 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index bfce896eb19..d1ba0645e05 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index 51234007ee1..b7fc52403af 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index eead2907fa2..4187f526393 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 1c757fa6c86..7b74d8b506d 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ --- Supprimme orhpelins pour permettre monte de la cl +-- Supprimme orhpelins pour permettre mont�e de la cl� -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index 79b52ba399c..f1f4a75b604 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 3757e4522bf..39b89773316 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index f5987250001..98b29b1f715 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 9c4a5e340ab..0eb566317d0 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 906d0a3e2f4..3fb9f7d6d2d 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index 20bb329ff0e..ba595100b5f 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index 2063a310fb8..b71d2697b85 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index a99b42859c7..61d63046fac 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index f0e0a065089..0e20201f4cb 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 06af8a78575..154f0b51006 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1c5d5c30173..1dc4941012a 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index e43f4cb118c..a208aa5fff0 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index e4eb41f3bb4..f60029ee290 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 463675b10b7..2833920b746 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index fc998bd6edb..7987ca819c1 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index 1e9b0495d34..e027d471e23 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ +-- $Id: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index b899c4303e1..8b279dc578b 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 5d6d86617e6..684c5aa5a7c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index 6de1b23eb64..cdccf3eb6ec 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index 04491e0878c..fee45753759 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 575930a728c..9401f679071 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 46b769b8afc..757e8d2b447 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index e1b82141ea1..d0118ebdc6c 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 19824c860de..57d92bc8ce9 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 455916a3010..6f2ddcf56b9 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 94e726796c5..6cf13137710 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index 8dbbb572f29..cee3ace0ec3 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 923c2441987..34d0bbac03b 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index 88cf83a3cc3..ef97e48a251 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index 68e21d26061..b674a0cf11d 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index f289b9cb514..5e3620cba87 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index a2e54d34770..bd3c0c7d780 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index dbeec277f88..1524eb7a77b 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index e3e5900fb74..75a4ce8fd06 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index 0669065b7d3..eafe6bd31e1 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index dcca0174817..6a06c0c70b5 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index 99cf1edd744..d4aa4b26d99 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index 415b44c6a35..b55d734674f 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index ba8b40b3c0a..22a5b9d5c52 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 40e131fefdf..5edbea4808d 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index bc11ca42c8f..5313952606a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index 8d4a4ecdcbf..c210f906b9b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index f43ab1e746a..29598bb4963 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index a52d3ed4a8b..cfaad1061df 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 4e9f0d1da0e..521d666742d 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index c9891219f4f..29af17f7c08 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 6b8f7176dee..917d6fc5cdf 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 399dd175311..87245438b4d 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index c06074d4709..373267c8921 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index 1e3f21d0eb7..b67427b9de8 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 08450aa204f..8f00ee95200 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index 9b0104ccfe5..edc76a392b0 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 0782e089170..302248ae299 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 68b6cd9a315..9c741080a27 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 177be65fb88..4dd0ae15ad4 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index d573c90eb18..ffc0666074d 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index e0b2c2494ad..96f122e59cd 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 92000240642..4beccac04b8 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 6240a2ed5c0..484cebf6a2a 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index e2c4be38a5f..a56201f7dba 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 51e133a86dc..84f6077e5ba 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index aab9c69c1a7..46685416239 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index dc9732c0719..1d41d1ab59e 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index 663adaffe60..d6dd854a240 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 73dc6489461..0b7d6a61f56 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index 0b42446740b..c1ee00edd07 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index 7d728850185..d694d696801 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index d062249c3b8..925ca9eee81 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f33c92ea7fe..f67337de388 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 92f21a35f28..8c8454fbc28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index e62275df23d..6c673570cfc 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 29ad3853f90..9c05ed97a8d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Ocbo +-- Copyright (C) 2005 Marc Barilley / Oc�bo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b9ba378d81f..b127b194fa5 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 8771b0ddda8..5c8ea94ed09 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 8bb011f7280..94ba92d4856 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 1aba5d286d1..4017ae32682 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index e0c4fd61701..2c77ae3447c 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 1e721e86788..52c0a3e2a03 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index d4ea3ad5535..439b2a68098 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index 6f8d6a8cf97..f01b7d02e8e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index 854ec6e826e..bd1e805aed2 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index f1e90520593..bfc2162ceca 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 15d3bda5ba2..784e3d37507 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 66a61851cae..029bc528b6e 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 195d2464738..9c066c54436 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index 44a301a2db7..f4e38524d25 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index 237b5c23030..f03d92ce651 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 3bec7551161..2c9c2d929db 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index 45845593162..d9e9ecd43a7 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 672374961d5..01cabfec865 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index d8d9443595d..696cf49c337 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index f21fed4d1af..170bd56f390 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index a501b4db4b6..5a3d71b489a 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index 41a91a9aa5f..d29449c2503 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index e12dbc6fb12..86f114d395b 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index 1a83bee6508..ce320558709 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 93a28593f8e..76f76ff08ed 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index ec2bb01863b..133687c7466 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 552a985abd4..6ccd3aa39fb 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index 63b28ac8410..e24a8918c5b 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index e7ccde53858..26e451271cb 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index a1619df5cb5..40b07d29305 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index 309c60b660f..e21669e63d7 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index c92472f7af5..d094512d975 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index 3fb70995900..a75fb9aa76d 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ +-- $Id: llx_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index e7fc66a0ed6..a0d88737e3f 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 57b252ed2ea..9e28a37d6bb 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index b8453ea821c..376447586c9 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index 00268974476..e7528a03f28 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 16bf4dea7f0..4f994cf57aa 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index eff6387abee..1a7fdfd755f 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index f53599483a4..a618e3d8790 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index b9643f019c3..902f2b4fd5f 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index db4cdd2581c..1f5500e2eb1 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index 6bf45f749f5..c7d84e27326 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 7db41de673c..523eb3b37e0 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index 8dc4636c87e..bf057b4ad75 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index d500fc1b7cb..ade6a40a80d 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index a515ba541bf..bca670bbb98 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index b742b82dafc..7481589df00 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index fff909a0ec8..4adaa1a56ff 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index fb65e9b7e84..16631c76b76 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 332b1305d38..3df14473a7e 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index ca4206eb6fc..c3958313ea3 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 68e1d4f20e9..910d2ab2072 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 8714e7e4a07..5c7f2e9a59c 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index 7d3b0eecd98..cbaadb10091 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index 8bdd7193d1a..e88665b5a34 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 367d45e8525..86916c216a2 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 28b28aeb762..23065b261c8 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ +-- $Id: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index d78db14c30b..3f58eaf698b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 68e46fd120d..18924ff6ac5 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 6acb2db4585..8056a150fc3 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 838f502bfdb..1b5ea5516d4 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index f21099e9c5e..e61985c7dd1 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index f771be5ef5a..7bf81b7fbe9 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 0033bca36bc..1fb0d708dfa 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 8037c9cd7e5..6df43634ec4 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 99234b6660f..7b6cbd91645 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index dca8e80f856..810781ed6d9 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index f3a58aa1433..2e89f083575 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index 98c56c37567..fd656c736ef 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 100d9fe82b0..87f6416c6c5 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ -- ============================================================================ CREATE LANGUAGE plpgsql; diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html deleted file mode 100644 index 38e0f007a15..00000000000 --- a/htdocs/langs/es_ES/html/gpl.html +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - -H. Licencia Pública GNU - - - - - - - - - - - - - -

                              Licencia Pública GNU

                              - - - - -
                              - -GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 - -
                              - -

                              Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, - MA 02139, USA.

                              -

                              Está permitido, a cualquier persona, copiar y distribuir copias tal cual de - este documento de licencia, sin la introducción de cualquier cambio. -

                              - -
                              -

                              Introducción

                              -

                              Las licencias de muchos softwares se desarrollan para asegurar la libertad - de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, - al contrario, pretende garantizar la libertad de compartir y alterar softwares - de libre distribución - volviéndolos de libre distribución también para cualquier - de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares - de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla - (algunos softwares de la FSF son cubiertos por la GNU Library General Public - License).

                              -

                              Cuando nos referimos a softwares de libre distribución, nos referimos a la - libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar - la libertad de distribución de copias de softwares de libre distribución (y - cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos - fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se - hacen algunas restricciones, para asegurar los derechos de los programadores, - prohibiendo a todas las personas su negación o la solicitación de su abdicación. - Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución - o modificación del software.

                              -

                              Por ejemplo, al distribuirse copias de determinado programa, por una tasa - determinada o gratuitamente, se debe informar sobre todos los derechos incidentes - sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia - Pública General GNU.

                              -

                              La protección de los derechos envuelve dos pasos: (1) copyright del software - y (2) licencia que da permiso legal para copia, distribución y/o modificación - del softwares.

                              -

                              Aún para la protección de la FSF y del autor es importante que todos entiendan - que no hay garantías para softwares de libre distribución. Si software se modifica - por alguien y lo pasa adelante, este software no más reflejará el trabajo original - del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                              -

                              Finalmente, cualquier programa de libre distribución está constantemente amenazado - por las patentes de softwares. Buscamos evitar el peligro de que distribuidores - de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. - Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación - de patente se debe hacer permitiendo el uso por cualquier individuo, sin la - necesidad de licencia de uso.

                              -

                              Los términos y condiciones precisas para copia, distribución y modificación - siguen abajo:

                              -
                              -

                              Licencia Pública General GNU

                              -

                              TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN -

                              - -
                                - -

                              1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga - un aviso colocado por el detentor de los derechos de autor diciendo que aquel - podrá ser distribuido en las condiciones de la Licencia Pública General. El - Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado - en un Programa y significa tanto el propio Programa, como cualquier de los - trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, - un trabajo que contenga el Programa o una parte de este, en su forma original - o con modificaciones o traducido para una otra lengua (la traducción está - incluida sin limitaciones en el término ``modificación'').

                                -

                                Actividades distintas de copia, distribución y modificación no están cubiertas - por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa - no está restringido y la salida del Programa está cubierta solamente en - el caso de que su contenido contenga trabajos basados en el Programa (independientemente - de que hayan sido creados por la ejecución del Programa). Si esto es así, - depende de las funciones ejecutadas por el Programa.

                                2. - -

                              2. El código fuente del Programa, de la forma como fue recibido, puede ser - copiado y distribuido, en cualquier media, desde que sea providenciado un - aviso adecuado sobre los copyrights y la negación de garantías, y todos los - avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, - estén inalterados y que cualquier producto oriundo del Programa esté acompañado - de esta Licencia Pública General.

                                -

                                Está permitido el cobro de tasas por el acto físico de transferencia o - grabación de copias, y pueden ser dadas garantías y soporte en cambio del - cobro de valores.

                                3. - - -
                              3. -

                                Se puede modificar la copia o copias del Programa de cualquier forma que - se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir - tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                                - -
                                  -

                                1. Debe existir un aviso destacado de que los datos originales fueron alterados - en los archivos y las fechas de los cambios;

                                  2. - -

                                2. Debe existir un aviso de que el trabajo distribuido o publicado es, - de forma total o parcial, derivado del Programa o de alguna parte suya, - y que puede ser licenciado totalmente sin costes para terceros bajo los - términos de esta Licencia.

                                  3. - -

                                3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, - en el inicio de tu ejecución, presentar la información de copyright y - de ausencia de garantías (o de que la garantía es de responsabilidad de - terceros), y que los usuarios pueden redistribuir el programa bajo estas - condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                                  4. -
                                - - Estos requisitos se aplican a trabajos de modificación en general. Si - algunas secciones identificables no sean derivadas del Programa, y pueden - ser consideradas como partes independientes, entonces esta Licencia y sus - Términos no se aplican a aquellas secciones cuando distribuidas separadamente. - Pero al distribuir aquellas secciones como parte de un trabajo basado en - el Programa, la distribución, como un todo, debe contener los términos de - esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no - a cada una de las partes independientemente de quem los tenga desarrollado. - Más que tener intención de contestar los derechos sobre el trabajo desarrollado - por alguien, esta sección objetiva propiciar la correcta distribución de - trabajos derivados del Programa. - Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado - en él ni a un trabajo basado en él, a un volumen de almacenaje o media de - distribución no obliga la utilización de esta Licencia y de sus términos - al trabajo. -
                                4. - - -
                              4. -

                                Están permitidas, la copia y la distribución, del Programa (o un trabajo - basado en éste) en la forma de código objeto o ejecutable de acuerdo con los - términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                                - -
                                  -

                                1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos - en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada - para manejo de softwares o

                                  -
                                  2. -

                                2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, - de poner a disposición a terceros, por un coste no superior al coste del - medio físico de almacenaje, una copia completa de los códigos fuente en - medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                                  -
                                  3. -

                                3. Esté acompañada con la misma información recibida en relación con la - oferta de la distribución del código fuente correspondiente (esta alternativa - solamente está permitida para distribuciones no comerciales y solamente - si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, - de acuerdo con la sección 2 arriba).

                                  -
                                  4. -
                                - El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones - en aquel trabajo. Cuando se habla en códigos fuentes completos significa - hablar de todos los fuentes de todos los módulos, además de las definiciones - de interfaces asociadas, archivos, scripts utilizados en la compilación - y instalación del ejecutable. Como una excepción excepcional, el código - fuente distribuido podrá no incluir algunos componentes que no se encuentren - en su escopo, como compilador, kernel, etc... para el SO donde el trabajo - sea ejecutado. - Si la distribución del ejecutable o objeto se hace, a través de acceso - a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente - de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos - con los objetos simultáneamente -
                                5. - -
                              5. -

                                No está permitida la copia, modificación, sublicenciamiento o distribución - del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier - tentativa de copia, modificación, sublicenciamiento o distribución del Programa - está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. - Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, - no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas - de esta Licencia.

                                6. -
                              6. -

                                No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá - documento o contrato que garantice permiso de modificación o distribución - del Programa o sus trabajos derivados. Estas acciones están prohibidas por - ley, en el caso de que no se acepten las condiciones de esta Licencia. La - modificación o distribución del Programa, o cualquier trabajo basado en éste, - implica en la aceptación de esta Licencia y de todos los términos de ésta - para copia, distribución o modificación del Programa o trabajos basados en - éste.

                                7. -
                              7. -

                                Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), - el recipiente automáticamente recibe una licencia del detentor original de - los derechos de copia, distribución o modificación del Programa objeto de - estos términos y condiciones. No pueden ser impuestas otras restricciones - en los recipientes.

                                8. - -
                              8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes - o derechos de autor, se impongan restricciones, que contradigan esta Licencia, - estos no exentan de su aplicación. Si no es posible distribuir el Programa - de forma a garantizar simultáneamente las obligaciones de esta Licencia y - otras que sean necesarias, entonces el Programa no podrá ser distribuido. -

                                Si esta Sección se considera, inválida por cualquier motivo particular - o general, su resultado implicará en la invalidación general de esta licencia - en la copia, modificación, sublicenciamiento o distribución del Programa - o trabajos basados en éste.

                                -

                                El propósito de esta sección no es, de forma alguna, incitar a quien quiera - que sea a infringir derechos reclamados en cuestiones válidas y procedentes, - y si proteger las premisas del sistema de libre distribución de software. - Muchas personas tienen hecho contribuciones generosas al sistema, en la - forma de programas, y es necesario garantizar la consistencia y credibilidad - del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución - de los softwares.

                                -

                                Esta sección pretende hacer claro los motivos que crearan las demás cláusulas - de estas Licencia.

                                9. - -
                              9. -

                                Si la distribución del Programa, dentro de los términos de esta Licencia, - tiene restricciones en algún País, por patentes o derechos de autor, el detentor - original de los derechos de autor del Programa bajo esta Licencia puede adicionar - explícitamente limitaciones geográficas de distribución, excluyendo aquellos - Países, haciendo con que la distribución solamente sea posible en los Países - no excluidos.

                                10. - -
                              10. -

                                La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) - puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública - General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos - objetivos y el espirito de la presente versión, pudiendo variar en detalles - referentes a nuevas situaciones encontradas.

                                -

                                A cada versión se da un número distinto. Si el Programa especifica, un - número de versión determinado de esta Licencia, que tenga en su contenido - la expresión ``o versión más actualizada'', es posible optar por las condiciones - de aquella versión o de cualquier versión más actualizada publicada por - la FSF.

                                11. - -
                              11. -

                                Si deseas incorporar parte del Programa en otros programas de libre distribución - de softwares hace falta autorización formal del autor. Para softwares que - la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde - que mantenido el espirito y objetivos originales de esta Licencia.

                                12. -
                              - -

                              AUSENCIA DE GARANTÍAS

                              -
                                -

                              1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER - GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE - EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS - DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, - LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD - Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS - CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y - REPAROS JUZGADOS NECESARIOS.

                                2. -

                              2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR - LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN - RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE - HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS - O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES - O DAÑOS.

                                -

                                FIN DE LA LICENCIA

                              - - -
                              -

                               

                              -

                              Apéndice

                              -

                              ¿Cómo aplicar estos términos a nuevos softwares?

                              -

                              Si has desarrollado un nuevo programa y deseas su amplia distribución para - el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, - que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                              -

                              Para esto basta con anexar este aviso al programa. Se recomienda indicar aún - en el inicio de cada archivo fuente la ausencia de garantías y una anotación - de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                              -

                              <nombre del programa y función> Copyright (C) 199X <Autor> -

                              -

                              Este programa es un software de libre distribución, que puede ser copiado - y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo - con la publicada por la Free Software Foundation, versión 2 de la licencia o - (a criterio del autor) cualquier versión posterior.

                              -

                              Este programa se distribuye en la expectativa de ser útil a sus usuarios, - pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE - ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General - 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. -

                              -

                              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:

                              -

                              Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares - NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software - de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. - Teclea 'muestra condic' para mayores detalles.

                              -

                              Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las - partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos - pueden variar o pueden ser accionados por otras interfaces como clic de ratón, - etc...

                              -

                               

                              -
                              -
                              - -www.conectiva.com - -
                              - - - - - diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt deleted file mode 100644 index 3efbe1ccee7..00000000000 --- a/htdocs/langs/nl_BE/html/gpl.txt +++ /dev/null @@ -1,340 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -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 deleted file mode 100644 index 778e2b02b41..00000000000 --- a/htdocs/langs/nl_NL/html/gpl.txt +++ /dev/null @@ -1,339 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van -deze licentie. \ No newline at end of file diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index c2d47f668da..4092c55ff2d 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ /** * \file htdocs/lib/admin.lib.php * \brief Library of admin functions - * \version $Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis 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.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $ */ function security_prepare_head() { @@ -615,16 +615,41 @@ function Activate($value,$withdeps=1) // Activate module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } $objMod = new $modName($db); @@ -700,20 +725,46 @@ function UnActivate($value,$requiredby=1) $modName = $value; $ret=''; + $modulesdir=array(); // Desactivation du module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } if ($found) diff --git a/htdocs/lib/ajax.lib.php b/htdocs/lib/ajax.lib.php index 55def736688..7db1908bc49 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ */ diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1bdeb9562e6..49b67f9349a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 1d5b4951490..eedd6a8841c 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -29,7 +29,7 @@ * \ingroup core * \brief File that defines environment for all Dolibarr process (pages or scripts) * This script reads the conf file, init $lang, $db and and empty $user - * \version $Id: master.inc.php,v 1.351 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ */ @@ -70,14 +70,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root[]=$value; + $conf->file->dol_document_root['alt']=$value; } } diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index 454073d9730..d6bf7267439 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index b5304ba4198..6e1e7b262f4 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index bda35165079..b0a7c2dece6 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id$ + * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ */ if (session_id() == "") session_start(); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 8bccf934120..1da2adb751e 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ + * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index efbd289cb3f..a65f888ab11 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ + * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ */ require("../main.inc.php"); @@ -1645,6 +1646,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 8f373b577e8..79601ea1031 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 724900dc500..8cf57ec0b64 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ + * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ */ require("../main.inc.php"); @@ -271,5 +272,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); +llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); ?> diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 1dfd99cc99e..ec5d660daef 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -25,7 +25,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.125 2011/07/31 23:22:57 eldy Exp $ + * \version $Id: soc.php,v 1.126 2011/08/01 00:38:49 eldy Exp $ */ require("../main.inc.php"); @@ -587,7 +587,8 @@ else if ($conf->fournisseur->enabled && (GETPOST("type")=='f' || GETPOST("type")=='')) { $object->fournisseur=1; } if (GETPOST("private")==1) { $object->particulier=1; } - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prenom=$_POST["prenom"]; $object->particulier=$_REQUEST["private"]; $object->prefix_comm=$_POST["prefix_comm"]; @@ -1093,7 +1094,8 @@ else if (! empty($_POST["nom"])) { // We overwrite with values if posted - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prefix_comm=$_POST["prefix_comm"]; $object->client=$_POST["client"]; $object->code_client=$_POST["code_client"]; @@ -1967,5 +1969,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.125 $'); +llxFooter('$Date: 2011/08/01 00:38:49 $ - $Revision: 1.126 $'); ?> \ No newline at end of file diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index edb62d728d5..78ca25e85a6 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $ + * \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index f93935ffb16..e78dff8f646 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id$ + * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index e4e52c611b4..9edcafd59c0 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/group/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.39 2011/07/31 23:21:25 eldy Exp $ + * \version $Id: perms.php,v 1.40 2011/08/01 13:15:53 hregis Exp $ */ require("../../main.inc.php"); @@ -93,10 +93,34 @@ if ($_GET["id"]) // Charge les modules soumis a permissions $modules = array(); - foreach ($conf->file->dol_document_root as $dirroot) + $modulesdir = array(); + + foreach ($conf->file->dol_document_root as $type => $dirroot) + { + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } + + foreach ($modulesdir as $dir) { - $dir = $dirroot . "/includes/modules/"; - // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                              "; $handle=@opendir($dir); @@ -292,5 +316,5 @@ if ($_GET["id"]) $db->close(); -llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.39 $'); +llxFooter('$Date: 2011/08/01 13:15:53 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index adb7fa764b6..47710b31d9d 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.56 2011/07/31 23:19:42 eldy Exp $ + * \version $Id: perms.php,v 1.57 2011/08/01 13:15:54 hregis Exp $ */ require("../main.inc.php"); @@ -120,12 +120,34 @@ $db->begin(); // Search all modules with permission and reload permissions def. $modules = array(); +$modulesdir = array(); -$listdir=$conf->file->dol_document_root; -foreach($listdir as $dirroot) +foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir=$dirroot."/includes/modules/"; + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} +foreach($modulesdir as $dir) +{ $handle=opendir($dir); if (is_resource($handle)) { @@ -373,5 +395,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.56 $'); +llxFooter('$Date: 2011/08/01 13:15:54 $ - $Revision: 1.57 $'); ?> From 8de2affa8f5df019b3c7baed5a30e6bfe23029c5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 21:04:27 +0000 Subject: [PATCH 107/118] Fix: jnotify was not visible --- htdocs/admin/proxy.php | 7 ++++--- htdocs/admin/security_other.php | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 2c284c5cae8..f02e3d6203a 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ + * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -205,5 +206,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c1d629f7b7b..c0aaaa86213 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -347,5 +348,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); ?> From 1d12745b6e257c54730aa66e926aa0768b380be2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 21:15:39 +0000 Subject: [PATCH 108/118] Fix: If list is empty, show "None". --- htdocs/compta/prelevement/create.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 79d00ae00c7..689e2639773 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ + * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -275,5 +276,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); +llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); ?> From a656afbcf9f27ad0616ab5b78685d5ba60055937 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 21:24:04 +0000 Subject: [PATCH 109/118] Fix: Trans From f222fbda4c1090bb62913f604da9beae2521b30e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 22:31:37 +0000 Subject: [PATCH 110/118] Fix: Bad line --- htdocs/imports/import.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 $'); /* From 9556007ee846bf3f45b306a4c4b432e1ed2a62a3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 30 Jul 2011 08:56:26 +0000 Subject: [PATCH 111/118] Fix: Removed not used function. --- htdocs/core/class/cookie.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 */ From 42efca75f7cab09caef8311ad6389efbea9327a6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:03:45 +0000 Subject: [PATCH 112/118] Fix: Avoid errors into rpm packages From 5510bba6b5fe4261cc3828d2fd425b7108e0868c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 20:47:34 +0000 Subject: [PATCH 113/118] Fix: Uniformize error management From 48c459870120176dd74a5da87c576213dd6d3528 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 23:54:11 +0000 Subject: [PATCH 114/118] Fix: Avoid errors into rpm packages --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/control.DEBIAN | 46 + build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 - build/deb/install | 1 - build/deb/po/fr.po | 22 +- build/deb/po/templates.pot | 20 +- build/deb/postinst | 100 +- build/deb/postrm | 119 +- build/deb/templates | 7 - build/makepack-dolibarr.pl | 204 +++- dev/skeletons/modMyModule.class.php | 4 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 33 +- htdocs/admin/perms.php | 32 +- htdocs/admin/proxy.php | 7 +- htdocs/admin/security_other.php | 7 +- htdocs/boxes.php | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/validation_verif.php | 3 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/compta/prelevement/create.php | 7 +- htdocs/contrat/fiche.php | 6 +- htdocs/core/class/conf.class.php | 6 +- htdocs/core/class/cookie.class.php | 5 +- htdocs/core/class/translate.class.php | 7 +- htdocs/filefunc.inc.php | 7 +- htdocs/imports/import.php | 7 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 +++++++++-------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/index.php | 7 +- htdocs/install/check.php | 5 +- htdocs/install/default.css | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 32 +- .../mysql/data/llx_20_c_departements.sql | 3 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/langs/es_ES/html/gpl.html | 330 ++++++ htdocs/langs/nl_BE/html/gpl.txt | 340 ++++++ htdocs/langs/nl_NL/html/gpl.txt | 339 ++++++ htdocs/lib/admin.lib.php | 77 +- htdocs/lib/ajax.lib.php | 5 +- htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 6 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- htdocs/societe/soc.php | 10 +- htdocs/theme/auguria/style.css.php | 5 +- .../smartphone/theme/default/default.css.php | 5 +- htdocs/user/group/perms.php | 34 +- htdocs/user/perms.php | 32 +- 341 files changed, 2820 insertions(+), 1622 deletions(-) create mode 100755 build/deb/control.DEBIAN create mode 100644 htdocs/langs/es_ES/html/gpl.html create mode 100644 htdocs/langs/nl_BE/html/gpl.txt create mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index d73d7a99219..edb46ffd5a3 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,13 +22,12 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build binary only package +# dpkg -b To build package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# dpkg-reconfigure -plow package Reconfigure package +# # dpkg -L packagename List content of installed package -# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index 3382966714b..b035f18ae1d 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 + -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN new file mode 100755 index 00000000000..7c66775bdf1 --- /dev/null +++ b/build/deb/control.DEBIAN @@ -0,0 +1,46 @@ +Package: dolibarr +Version: __VERSION__ +Architecture: all +Maintainer: Laurent Destailleur +Installed-Size: 61200 +Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Section: web +Priority: optional +Homepage: http://www.dolibarr.org +Description: Easy to use web based ERP & CRM software + Dolibarr ERP & CRM is an easy to use open source/free software for small + and medium companies, foundations or freelances. It includes different + features for Enterprise Resource Planning (ERP) and Customer Relationship + Management (CRM) but also for different other activities. + It's a web software you can install as a standalone program or on any web + hosting provider to use it from anywhere with any web browser. + Dolibarr was designed to provide only features you need and be easy to use. + . + Only features you need are visible, depending on which module were activated. + Most common used modules are: + . + Customers, Suppliers or Prospects directory, + Contacts directory, + Orders management, + Commercial proposals management, + Invoices management, + Products and services catalog, + Stock management, + Foundations members management, + Bank accounts management, + Point of Sale, + Payments management, + Commercial actions management, + Contracts management, + Standing orders management, + Shipping management, + Donations management, + Bookmarks management, + Mass Emailings, + Reports, + Wizards to export and import data, + LDAP connectivity, + PDF exports, + And a lot of more modules... + . + You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index e28258d8dbc..91f0705c001 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,16 +4,10 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper (>= 7), po-debconf +Build-Depends: debhelper, po-debconf Package: dolibarr -Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, - php5-mysql | php5-mysqli, - php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, - ${misc:Depends}, xdg-utils, - mysql-server, perl -Recommends: apache2 | lighttpd | httpd, mysql-client -Suggests: www-browser +Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl Architecture: all Section: web Priority: optional diff --git a/build/deb/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 b/build/deb/install index 2928d378abc..4d41fd52c65 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,5 +1,4 @@ etc/dolibarr/apache.conf -etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 3bbe762283a..13b8030ed0d 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:49+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,26 +25,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Seveur web à reconfigurer automatiquement:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"dolibarr." -msgstr "" -"Selectionnez le serveur web à configurer automatiquement pour utiliser " -"dolibarr." - # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -52,7 +36,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index d65e5d8b7f6..32c92a97cc4 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,29 +17,15 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"dolibarr." -msgstr "" - #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index e0bba1be4da..ca5fd1645dd 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,5 +1,7 @@ #!/bin/sh # postinst script for dolibarr +# +# see: dh_installdeb(1) set -e @@ -14,31 +16,6 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - - -lighttpd_install() { - if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - if which lighty-enable-mod >/dev/null 2>&1 ; then - echo "Add link for Lighttpd config file" - ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf - # We enabled it - lighty-enable-mod dolibarr fastcgi-php - else - echo "Lighttpd not installed, skipping" - fi - fi -} - -apache_install() { - webserver=$1 - if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Add link for Apache config file" - ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - . /usr/share/debconf/confmodule db_version 2.0 @@ -50,6 +27,8 @@ echo Run the dolibarr postinst script # Define vars docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" installconfig="/etc/dolibarr/install.forced.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php" @@ -65,6 +44,10 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir + # Copy apache.conf file into target directory + #mkdir -p /etc/dolibarr + #cp -p $apachefileorig $apacheconfig + # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -91,15 +74,21 @@ case "$1" in chmod -R 660 $config fi - - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - + # Get the web server type (use db_get for interactive mode). + #db_reset "dolibarr/webserver" + #db_get "dolibarr/webserver" # Read value for webserver. + #webserver="$RET" + + case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; + esac + # Set up web server. - for webserver in $webservers ; do - webserver=${webserver%,} - echo Complete config of server $webserver + for server in $webservers ; do + echo Complete config of server $server # Detect webuser and webgroup webuser= @@ -117,31 +106,26 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config + + # Add link to config file + echo Setup web server $server to add dolibarr config file + ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf + done - # Restart web server. - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_install - else - apache_install $webserver - fi - # Reload webserver in any case, configuration might have changed - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $webserver reload 3>/dev/null || true - else - echo Restart web server $server using $server reload - /etc/init.d/$webserver reload 3>/dev/null || true - fi - fi + # Restart servers + servers="apache2-ssl apache2 mysql" + # Another way to restart + for server in $servers ; do + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $server reload || true + else + echo Restart web server $server using $server reload + /etc/init.d/$server reload || true + fi done - echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -152,13 +136,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument $1" >&2 + echo "postinst called with unknown argument \`$1'" >&2 exit 0 ;; esac -#DEBHELPER# - db_stop +#DEBHELPER# + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 27ce3777b7e..9eae81b022b 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,36 +17,7 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - -lighttpd_remove() { - if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - echo "Remove link for Lighttpd config file" - rm -f /etc/lighttpd/conf-available/50-dolibarr.conf - if which lighty-enable-mod >/dev/null 2>&1 ; then - lighty-disable-mod dolibarr - else - echo "Lighttpd not installed, skipping" - fi - # See bug #448682 - if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then - echo 'Manually deleting lighttpd/dolibarr configuration link' - rm /etc/lighttpd/conf-enabled/50-dolibarr.conf - fi - fi -} - -apache_remove() { - if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Remove link for Apache config file" - rm -f /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule -fi +. /usr/share/debconf/confmodule db_version 2.0 @@ -55,62 +26,63 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" +export webserver="" +# Allows us to loop and substitute in one pass +case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; +esac + case "$1" in # Call when we upgrade upgrade) - echo "postrm upgrade" ;; # Call when we uninstall remove) - echo "postrm remove" rm -f $lockfile - # Reconfigure web server - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - - # Restart web servers - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_remove - else - apache_remove $webserver - fi - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $webserver reload 3>/dev/null || true - else - /etc/init.d/$webserver reload 3>/dev/null || true - fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete link $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge" + echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical dolibarr/postrm || true + db_input critical "dolibarr/postrm" || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get dolibarr/postrm + db_get "dolibarr/postrm" set -e if [ "$RET" = "true" ] ; then @@ -213,12 +185,41 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete file $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" + fi + done + rm -rf /etc/dolibarr + # Restart servers + for server in $restart ; do + # We disable blocking errors + set +e + echo "Restart server $server if exists" + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $server reload || true + else + /etc/init.d/$server reload || true + fi + # We restore blocking errors + set -e + done + # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset dolibarr/reconfigure-webserver - db_reset dolibarr/postrm + db_reset "dolibarr/postrm" set -e #db_purge @@ -228,7 +229,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument $1" >&2 + echo "postrm called with unknown argument \`$1'" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index b96325a4e64..5c06afd8ccd 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,10 +1,3 @@ -Template: dolibarr/reconfigure-webserver -Type: multiselect -Choices: apache2, lighttpd -_Description: Web server to reconfigure automatically: - Please choose the web server that should be automatically configured - to run dolibarr. - Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index f191d88c7f9..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.121 2011/07/28 23:05:13 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.121 $'; $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,6 +276,10 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mssql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`; @@ -291,11 +298,6 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`; $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; $ret=`rm -fr $BUILDROOT/$PROJECT/document`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`; @@ -306,6 +308,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; @@ -413,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"; @@ -438,16 +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/$PROJECT.tmp/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + # To remove once stable + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + + # Apache conf files + #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + + # Dolibarr conf files + # TODO + + # dolibarr.desktop + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; + #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; + #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; + + # pixmap + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; + #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; + #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; + + # Set owners + print "Set owners on files/dir\n"; + $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; + + print "Set permissions on files/dir\n"; + $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; + $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + + # Build tgz print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n"; $ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; @@ -475,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; } @@ -525,20 +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`; @@ -598,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`; @@ -652,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`; @@ -690,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; } 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/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/proxy.php b/htdocs/admin/proxy.php index f02e3d6203a..2c284c5cae8 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ */ require("../main.inc.php"); @@ -206,5 +205,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); +llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c0aaaa86213..c1d629f7b7b 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ */ require("../main.inc.php"); @@ -348,5 +347,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); +llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); ?> 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/css/style.css b/htdocs/cashdesk/css/style.css index 698cceb4966..c79d46fbeb5 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,10 +11,11 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ +/* \version $Id$ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index 2d89cfd2388..f91946e11c0 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.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. */ // Instanciation et initialisation de l'objet xmlhttprequest diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index 0d679c15b84..1afc2d54b02 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ require('../main.inc.php'); diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 96de90124f9..259dc4dbce5 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -47,7 +48,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -66,7 +67,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -77,17 +78,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 5ba2ef8997e..0c262ba2936 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ */ require("./pre.inc.php"); @@ -386,5 +385,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); +llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 9ee1f551048..525160df9ef 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ */ require("./pre.inc.php"); @@ -608,5 +607,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); +llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); ?> diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 0efb704828f..e05eaa66ecf 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ + * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ */ require('../main.inc.php'); @@ -1031,5 +1032,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); +llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 5da397b4183..d2f2a7aae7e 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ + * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ */ require('../main.inc.php'); @@ -672,5 +673,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); +llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); ?> diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 689e2639773..79d00ae00c7 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ + * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -276,5 +275,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); +llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); ?> diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index b0145e14628..0cf91d64abc 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -23,7 +23,7 @@ * \file htdocs/contrat/fiche.php * \ingroup contrat * \brief Page of a contract - * \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $ + * \version $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $ */ require ("../main.inc.php"); @@ -757,7 +757,7 @@ else $var=!$var; - if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid) + if ($action != 'editline' || $_GET["rowid"] != $objp->rowid) { print ''; // Libelle @@ -1286,5 +1286,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $'); +llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index c5664164e74..acb0b5d9167 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -24,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ + * \version $Id: conf.class.php,v 1.63 2011/07/31 23:45:13 eldy Exp $ */ @@ -144,13 +144,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 07fed567b48..c21450bb8cb 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ + * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 4496c18ff1f..bf30794f153 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -23,7 +23,7 @@ * \brief File for Tanslate class * \author Eric Seigne * \author Laurent Destailleur - * \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $ + * \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $ */ @@ -512,10 +512,9 @@ class Translate { * Return list of all available languages * @param langdir Directory to scan * @param maxlength Max length for each value in combo box (will be truncated) - * @param usecode Show code instead of country name for language variant * @return array List of languages */ - function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0) + function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0) { global $conf; @@ -528,7 +527,7 @@ class Translate { { $this->load("languages"); - if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE)) + if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE) { $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength); } diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 13a97bf54b3..3148174f5af 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,15 +20,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -65,7 +64,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index c03b55d2347..97d4d8252d3 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ + * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ */ require_once("../main.inc.php"); @@ -1669,7 +1668,7 @@ print '
                              '; $db->close(); -llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); +llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); /* diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 6f6c7ed2a1b..257b95e4e3c 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -64,7 +65,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.31 $'); + $ver=explode(' ','$Revision: 1.30 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 446606ef055..127eb16e389 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -63,7 +64,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
                              This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.28 $'); + $ver=explode(' ','$Revision: 1.27 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 46fa4c9ccc4..9c90d1fcc94 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,7 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program. If not, see . +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* or see http://www.gnu.org/ */ /** @@ -20,7 +22,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -59,7 +61,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
                              This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.14 $'); + $ver=explode(' ','$Revision$'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index 7055bef4b69..ec7e1af07c6 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ + * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/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/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index 067e831b0b4..b1e3f5a2638 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,503 +1,504 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index e5f0ff4c0e5..b1e3f5a2638 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,7 +484,8 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/index.php b/htdocs/index.php index 5998094d362..f027e94a35a 100644 --- a/htdocs/index.php +++ b/htdocs/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/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -574,7 +573,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); +llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 3724ef23d95..9b19d9793fc 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 1d2084e7c7f..9978c8f437a 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/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.24 2011/08/03 01:32:42 eldy Exp $ + * $Id$ */ body { diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 20ef1080e85..737e16cc10c 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 5d7fca530f2..c9713870c22 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index d7df4ac6929..e7b45a476f1 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 9a0dd0fcc43..62e0a4a90cf 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 0037190af06..50fa9904890 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ + * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 6d19b01e197..2e0fccb0051 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 3050d37833c..223a2eb6d92 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -75,10 +74,12 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +$lockfile = '../../install.lock'; +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; - +#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here +$lockfile = '../../install.lock'; if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -178,7 +179,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists('../../install.lock')) +if (file_exists($lockfile)) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
                              '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index c786f91346c..841136fff8b 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 275298588e2..9d08a56e41c 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,9 +17,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_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 1c43326d70f..1f046a29bc4 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ -- -- @@ -158,21 +158,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1); -- Regions Chile (id country=67) -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1); -- Regions San Salvador (id country=86) INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1); diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index e3963e8e68f..9a109ab3fdc 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ -- -- @@ -566,7 +566,6 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1); diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index da244f79951..56ceea3d807 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,9 +17,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_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index eee5dfa185a..3a248c2f49f 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,9 +18,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_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index e3922b97f65..dcbaf2faaf4 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,9 +17,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_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index b7f6c71c87e..1dd3cb59a62 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,9 +11,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_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index f3299990858..5e93e39d048 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,9 +17,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_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index 1f14cc8c142..e3ed8196d17 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,9 +17,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_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 5017ce0c60d..176e5c796e2 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,9 +17,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_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index f58db2b32a6..db630463dbf 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,9 +17,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_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index 079caa7dde4..c67d263853d 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,9 +17,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_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 4bb81528e74..07fa2abaa83 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,9 +18,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_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index 720413ac480..e29b3f306f5 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,9 +17,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_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index cb0b557b438..c7fa6b6dd1f 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.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_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index a3a19cc2125..6a597996424 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,9 +17,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_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 1ec498e6bc2..78e174b9817 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,9 +17,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_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a17978bb0c..3a535a5098e 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,9 +17,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_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index 96d456312df..f6395abbfcd 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,9 +17,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_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 488b0a564eb..9c28f697f83 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,9 +17,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_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index d8701c52c01..988d9c26136 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,9 +17,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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- @@ -33,4 +34,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2fd47385a90..2d1a3c62a39 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,9 +17,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_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index da98640fd25..4238000eb14 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,9 +17,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_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 789ad16fce2..6e596be24e5 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,9 +17,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_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index 48b77951e1f..e2faed3cba3 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,9 +17,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_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index 59bd3d1ef00..cf7e9e96275 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,9 +17,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_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index cd2f27a5dca..655848a50ae 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.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: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 42f86f1c447..968a131e2bb 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -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: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 685170362fd..6e6e960072b 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.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_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 921bc569980..02ff06ba9f1 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.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_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index d5902b539c7..f22262c9353 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.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_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index ddd3d734ff7..b2cdf08af5f 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.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_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 8c5c23bbe62..031bfb614e1 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -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: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index f7b876eed86..3aa9555979e 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -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: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 8d34e2a9c78..4703aa32ddd 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -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: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index ad6f448e3dc..69bf706ca68 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,9 +15,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_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 51d66c04584..9156b439833 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,9 +15,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_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index 7df7f21a3b9..db64e0cbf9c 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -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: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index 31676d7d6e2..a7efcbd0f6d 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -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: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index bc9d9ad0936..7e4fa074e71 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -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: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index 18eed730ab8..d23a1367f92 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index ade41da746e..2b2db5af657 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index 62a88236480..b5c9175202b 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 015a9e9b4c0..6ed1e00dd88 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index 296b49fc93f..d1279c21eb2 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 9cedf70e7ca..822a69bc4ec 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index 55718d8ffb5..aba765190ee 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.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_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index abc9baa2d8c..eded16c49fe 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -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: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index 3dd83585bcd..e39fbf71f12 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -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: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 217edcaddbb..3710a87470a 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -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: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index 5869f24d8bd..ad41449f288 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -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: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index 5db17f19069..f6301a24919 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index 5f66ff625f0..cd68a9cdb40 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index b0546729ef0..890c7597862 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.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_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index 4794113f8bd..d67cf7fe4b8 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -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: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5fc25f57339..5c06c73c69d 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 5746cce26aa..115bd310d70 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index ba1e56e2b94..d3c71cc4a70 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.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_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index de9c23e9c05..10c4cc2d853 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,10 +13,11 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, 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_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index cce9d04707b..09365976d78 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.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_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 93e8e3d99a7..463b1235094 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -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: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index b0f31fe7116..c81a2b3e830 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -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: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index cb2251cfaf6..821fe3e5c04 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -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: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 8bebcf13116..9380607010d 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index b30354cae19..e524d9c937a 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index b026a40d762..0b0b34390c4 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -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: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 39d21cee7b9..7b5fa661d7d 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -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: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index d1e6b216b4b..e2f225fe608 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.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_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 60af7723f30..66cd5111325 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -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: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index cb223ae5532..ebca12ab5da 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -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: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 415b8526793..3872bedd39d 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -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: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index 5c54695f608..bed4ad41dfc 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 93ef5d59770..23cd0f575ed 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index 7702a8cf21e..f46d2a56c33 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.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_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 46a35567e95..4669de108f4 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.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_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index c2c43a3a625..a6bb8ca70f7 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -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: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 547500d7f33..5637e5a987d 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -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: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index bf7ed18af80..884d8274cfd 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.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_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index d0dceaf0fe1..2b6dea6cbd3 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -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: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 192183be0c1..76aecebbb9a 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -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: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index d6d673962b9..665a210d74b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -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: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index c8deefef6d7..7fcd57e31eb 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -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: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index 757653f1fc2..e1cab3b3368 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -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: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f2fb7fda4d3..f97e458be6b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -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: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 7a228ec1572..165a8550331 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -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: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 120e27ae77d..6efa388ef81 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.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_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index a5e3fd8721b..c8824b2d04e 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.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_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 418e37a85b1..311183c87f4 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.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_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 1cc5dbfaf0e..2d00f620e02 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -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: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 84c72e0839b..02052920c8a 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -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: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 8cf0ec900f8..0f608cbc171 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.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_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 2eed307bc54..75b40946559 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.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_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index c977dd9dd21..76caf44356d 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 8307ca88eb6..861671e3607 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -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: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 9a7bda88c28..46504e8a1c4 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -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: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index 725ddbfeb90..dc284fc8cea 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -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: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index a1feeb33f8b..4f8736a3a14 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -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. -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -23,7 +24,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 1e141b7768a..85ea592d950 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -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: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 79d54faf623..9fad6cc333e 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -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: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index 97638937c74..d6bd27758b4 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -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: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 211af70a854..40759cdc50b 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.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_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 7c4c534451d..80e73c43399 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -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: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index f2330322a5f..4c466e0c02b 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -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: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 8e4492c28a9..46a39b3c9e7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -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: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 39be52cf374..60641bf1876 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -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: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index e93ce9b4354..cfe126b5adf 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.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_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index baa01289b96..7e12e06beb7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -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: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index bd19d25f1a5..83eb804c875 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -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: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index eb95b9fe66c..6236e113766 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -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: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index 2c95fde3255..cf5121c34f9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -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: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index d62011351c4..cabdcce3a80 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index a07ff049d61..ebaf9582414 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index 730bc11ac98..fa9a85aac1f 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -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: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index 6f129f2feec..ec8931763bf 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -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: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 172a2432ee1..7958b56f354 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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. -- --- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orphelins pour permettre mont�e de la cl� +-- Supprimme orphelins pour permettre monte de la cl -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index c13c0aa6019..3f848c9ffe2 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index f0c65456e5c..df6d49827f6 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index be4e60a9a97..9bb45f9d326 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -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: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 23cfd068495..91914ab66c7 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -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: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b18165255..d1b39863cab 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -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: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index 19ec675f973..e964fbc2f5e 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -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: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a53a24d9a66..a747c714fb3 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.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_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 46639ca7c1e..16ecb365d6c 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.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_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index d1ba0645e05..bfce896eb19 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.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_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index b7fc52403af..51234007ee1 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.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_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index 4187f526393..eead2907fa2 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,9 +15,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_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 7b74d8b506d..1c757fa6c86 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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. -- --- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orhpelins pour permettre mont�e de la cl� +-- Supprimme orhpelins pour permettre monte de la cl -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index f1f4a75b604..79b52ba399c 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -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: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 39b89773316..3757e4522bf 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -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: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index 98b29b1f715..f5987250001 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -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: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 0eb566317d0..9c4a5e340ab 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 3fb9f7d6d2d..906d0a3e2f4 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index ba595100b5f..20bb329ff0e 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index b71d2697b85..2063a310fb8 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index 61d63046fac..a99b42859c7 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -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: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index 0e20201f4cb..f0e0a065089 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.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_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 154f0b51006..06af8a78575 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.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_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1dc4941012a..1c5d5c30173 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -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: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index a208aa5fff0..e43f4cb118c 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -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: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index f60029ee290..e4eb41f3bb4 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.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_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 2833920b746..463675b10b7 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -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: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index 7987ca819c1..fc998bd6edb 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.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_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index e027d471e23..1e9b0495d34 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -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: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ +-- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index 8b279dc578b..b899c4303e1 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.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_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 684c5aa5a7c..5d6d86617e6 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -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: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index cdccf3eb6ec..6de1b23eb64 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.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_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index fee45753759..04491e0878c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -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: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 9401f679071..575930a728c 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -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: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 757e8d2b447..46b769b8afc 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.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_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index d0118ebdc6c..e1b82141ea1 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 57d92bc8ce9..19824c860de 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 6f2ddcf56b9..455916a3010 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.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_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 6cf13137710..94e726796c5 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.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_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index cee3ace0ec3..8dbbb572f29 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -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: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 34d0bbac03b..923c2441987 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.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_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index ef97e48a251..88cf83a3cc3 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -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: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index b674a0cf11d..68e21d26061 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -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: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index 5e3620cba87..f289b9cb514 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -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: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index bd3c0c7d780..a2e54d34770 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -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: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index 1524eb7a77b..dbeec277f88 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -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: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index 75a4ce8fd06..e3e5900fb74 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.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_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index eafe6bd31e1..0669065b7d3 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -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: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index 6a06c0c70b5..dcca0174817 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -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: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index d4aa4b26d99..99cf1edd744 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.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_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index b55d734674f..415b44c6a35 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -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: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index 22a5b9d5c52..ba8b40b3c0a 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -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: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 5edbea4808d..40e131fefdf 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,9 +15,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_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index 5313952606a..bc11ca42c8f 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -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: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index c210f906b9b..8d4a4ecdcbf 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,9 +15,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_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index 29598bb4963..f43ab1e746a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.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_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index cfaad1061df..a52d3ed4a8b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -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: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 521d666742d..4e9f0d1da0e 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -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: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index 29af17f7c08..c9891219f4f 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,9 +15,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_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 917d6fc5cdf..6b8f7176dee 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -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: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 87245438b4d..399dd175311 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,9 +15,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_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index 373267c8921..c06074d4709 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,9 +15,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_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index b67427b9de8..1e3f21d0eb7 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.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_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 8f00ee95200..08450aa204f 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -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: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index edc76a392b0..9b0104ccfe5 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.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_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 302248ae299..0782e089170 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -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: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 9c741080a27..68b6cd9a315 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 4dd0ae15ad4..177be65fb88 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index ffc0666074d..d573c90eb18 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -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: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index 96f122e59cd..e0b2c2494ad 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -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: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 4beccac04b8..92000240642 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -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: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 484cebf6a2a..6240a2ed5c0 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -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: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index a56201f7dba..e2c4be38a5f 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -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: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 84f6077e5ba..51e133a86dc 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.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_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index 46685416239..aab9c69c1a7 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -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: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index 1d41d1ab59e..dc9732c0719 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -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: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index d6dd854a240..663adaffe60 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -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: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 0b7d6a61f56..73dc6489461 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -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: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index c1ee00edd07..0b42446740b 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.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_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index d694d696801..7d728850185 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -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: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index 925ca9eee81..d062249c3b8 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f67337de388..f33c92ea7fe 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 8c8454fbc28..92f21a35f28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.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_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index 6c673570cfc..e62275df23d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -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: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 9c05ed97a8d..29ad3853f90 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Oc�bo +-- Copyright (C) 2005 Marc Barilley / Ocbo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -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: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b127b194fa5..b9ba378d81f 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -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: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 5c8ea94ed09..8771b0ddda8 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.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_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 94ba92d4856..8bb011f7280 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.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_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 4017ae32682..1aba5d286d1 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -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: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index 2c77ae3447c..e0c4fd61701 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -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: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 52c0a3e2a03..1e721e86788 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.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_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index 439b2a68098..d4ea3ad5535 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.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_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index f01b7d02e8e..6f8d6a8cf97 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -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: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index bd1e805aed2..854ec6e826e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.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_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index bfc2162ceca..f1e90520593 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.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_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 784e3d37507..15d3bda5ba2 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -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: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 029bc528b6e..66a61851cae 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,9 +15,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_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 9c066c54436..195d2464738 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.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_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index f4e38524d25..44a301a2db7 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -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: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index f03d92ce651..237b5c23030 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.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_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 2c9c2d929db..3bec7551161 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index d9e9ecd43a7..45845593162 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 01cabfec865..672374961d5 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -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: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index 696cf49c337..d8d9443595d 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -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: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index 170bd56f390..f21fed4d1af 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -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: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index 5a3d71b489a..a501b4db4b6 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -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: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index d29449c2503..41a91a9aa5f 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.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_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index 86f114d395b..e12dbc6fb12 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -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: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index ce320558709..1a83bee6508 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -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: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 76f76ff08ed..93a28593f8e 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -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: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index 133687c7466..ec2bb01863b 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -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: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 6ccd3aa39fb..552a985abd4 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -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: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index e24a8918c5b..63b28ac8410 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -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: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index 26e451271cb..e7ccde53858 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -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: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index 40b07d29305..a1619df5cb5 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -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: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index e21669e63d7..309c60b660f 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.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_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index d094512d975..c92472f7af5 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -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: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index a75fb9aa76d..3fb70995900 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,9 +15,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_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ +-- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index a0d88737e3f..e7fc66a0ed6 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.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_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 9e28a37d6bb..57b252ed2ea 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -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: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index 376447586c9..b8453ea821c 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.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_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index e7528a03f28..00268974476 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -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: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 4f994cf57aa..16bf4dea7f0 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.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_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index 1a7fdfd755f..eff6387abee 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,9 +15,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_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index a618e3d8790..f53599483a4 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -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: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index 902f2b4fd5f..b9643f019c3 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.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_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index 1f5500e2eb1..db4cdd2581c 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -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: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index c7d84e27326..6bf45f749f5 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 523eb3b37e0..7db41de673c 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index bf057b4ad75..8dc4636c87e 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -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: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index ade6a40a80d..d500fc1b7cb 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.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_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index bca670bbb98..a515ba541bf 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -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: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index 7481589df00..b742b82dafc 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -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: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index 4adaa1a56ff..fff909a0ec8 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -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: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index 16631c76b76..fb65e9b7e84 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -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: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 3df14473a7e..332b1305d38 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.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_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index c3958313ea3..ca4206eb6fc 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -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: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 910d2ab2072..68e1d4f20e9 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -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: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 5c7f2e9a59c..8714e7e4a07 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -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: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index cbaadb10091..7d3b0eecd98 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.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_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index e88665b5a34..8bdd7193d1a 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -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: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 86916c216a2..367d45e8525 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -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: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 23065b261c8..28b28aeb762 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -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: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index 3f58eaf698b..d78db14c30b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -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: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 18924ff6ac5..68e46fd120d 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.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_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 8056a150fc3..6acb2db4585 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.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_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 1b5ea5516d4..838f502bfdb 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -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: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index e61985c7dd1..f21099e9c5e 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -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: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index 7bf81b7fbe9..f771be5ef5a 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.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_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 1fb0d708dfa..0033bca36bc 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.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_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 6df43634ec4..8037c9cd7e5 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -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: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 7b6cbd91645..99234b6660f 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index 810781ed6d9..dca8e80f856 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index 2e89f083575..f3a58aa1433 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.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_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index fd656c736ef..98c56c37567 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -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: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 87f6416c6c5..100d9fe82b0 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -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: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- ============================================================================ CREATE LANGUAGE plpgsql; diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html new file mode 100644 index 00000000000..38e0f007a15 --- /dev/null +++ b/htdocs/langs/es_ES/html/gpl.html @@ -0,0 +1,330 @@ + + + + + + + + +H. Licencia Pública GNU + + + + + + + + + + + + + +

                              Licencia Pública GNU

                              + + + + +
                              + +GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 + +
                              + +

                              Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, + MA 02139, USA.

                              +

                              Está permitido, a cualquier persona, copiar y distribuir copias tal cual de + este documento de licencia, sin la introducción de cualquier cambio. +

                              + +
                              +

                              Introducción

                              +

                              Las licencias de muchos softwares se desarrollan para asegurar la libertad + de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, + al contrario, pretende garantizar la libertad de compartir y alterar softwares + de libre distribución - volviéndolos de libre distribución también para cualquier + de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares + de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla + (algunos softwares de la FSF son cubiertos por la GNU Library General Public + License).

                              +

                              Cuando nos referimos a softwares de libre distribución, nos referimos a la + libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar + la libertad de distribución de copias de softwares de libre distribución (y + cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos + fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se + hacen algunas restricciones, para asegurar los derechos de los programadores, + prohibiendo a todas las personas su negación o la solicitación de su abdicación. + Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución + o modificación del software.

                              +

                              Por ejemplo, al distribuirse copias de determinado programa, por una tasa + determinada o gratuitamente, se debe informar sobre todos los derechos incidentes + sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia + Pública General GNU.

                              +

                              La protección de los derechos envuelve dos pasos: (1) copyright del software + y (2) licencia que da permiso legal para copia, distribución y/o modificación + del softwares.

                              +

                              Aún para la protección de la FSF y del autor es importante que todos entiendan + que no hay garantías para softwares de libre distribución. Si software se modifica + por alguien y lo pasa adelante, este software no más reflejará el trabajo original + del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                              +

                              Finalmente, cualquier programa de libre distribución está constantemente amenazado + por las patentes de softwares. Buscamos evitar el peligro de que distribuidores + de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. + Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación + de patente se debe hacer permitiendo el uso por cualquier individuo, sin la + necesidad de licencia de uso.

                              +

                              Los términos y condiciones precisas para copia, distribución y modificación + siguen abajo:

                              +
                              +

                              Licencia Pública General GNU

                              +

                              TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN +

                              + +
                                + +

                              1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga + un aviso colocado por el detentor de los derechos de autor diciendo que aquel + podrá ser distribuido en las condiciones de la Licencia Pública General. El + Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado + en un Programa y significa tanto el propio Programa, como cualquier de los + trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, + un trabajo que contenga el Programa o una parte de este, en su forma original + o con modificaciones o traducido para una otra lengua (la traducción está + incluida sin limitaciones en el término ``modificación'').

                                +

                                Actividades distintas de copia, distribución y modificación no están cubiertas + por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa + no está restringido y la salida del Programa está cubierta solamente en + el caso de que su contenido contenga trabajos basados en el Programa (independientemente + de que hayan sido creados por la ejecución del Programa). Si esto es así, + depende de las funciones ejecutadas por el Programa.

                                2. + +

                              2. El código fuente del Programa, de la forma como fue recibido, puede ser + copiado y distribuido, en cualquier media, desde que sea providenciado un + aviso adecuado sobre los copyrights y la negación de garantías, y todos los + avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, + estén inalterados y que cualquier producto oriundo del Programa esté acompañado + de esta Licencia Pública General.

                                +

                                Está permitido el cobro de tasas por el acto físico de transferencia o + grabación de copias, y pueden ser dadas garantías y soporte en cambio del + cobro de valores.

                                3. + + +
                              3. +

                                Se puede modificar la copia o copias del Programa de cualquier forma que + se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir + tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                                + +
                                  +

                                1. Debe existir un aviso destacado de que los datos originales fueron alterados + en los archivos y las fechas de los cambios;

                                  2. + +

                                2. Debe existir un aviso de que el trabajo distribuido o publicado es, + de forma total o parcial, derivado del Programa o de alguna parte suya, + y que puede ser licenciado totalmente sin costes para terceros bajo los + términos de esta Licencia.

                                  3. + +

                                3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, + en el inicio de tu ejecución, presentar la información de copyright y + de ausencia de garantías (o de que la garantía es de responsabilidad de + terceros), y que los usuarios pueden redistribuir el programa bajo estas + condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                                  4. +
                                + + Estos requisitos se aplican a trabajos de modificación en general. Si + algunas secciones identificables no sean derivadas del Programa, y pueden + ser consideradas como partes independientes, entonces esta Licencia y sus + Términos no se aplican a aquellas secciones cuando distribuidas separadamente. + Pero al distribuir aquellas secciones como parte de un trabajo basado en + el Programa, la distribución, como un todo, debe contener los términos de + esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no + a cada una de las partes independientemente de quem los tenga desarrollado. + Más que tener intención de contestar los derechos sobre el trabajo desarrollado + por alguien, esta sección objetiva propiciar la correcta distribución de + trabajos derivados del Programa. + Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado + en él ni a un trabajo basado en él, a un volumen de almacenaje o media de + distribución no obliga la utilización de esta Licencia y de sus términos + al trabajo. +
                                4. + + +
                              4. +

                                Están permitidas, la copia y la distribución, del Programa (o un trabajo + basado en éste) en la forma de código objeto o ejecutable de acuerdo con los + términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                                + +
                                  +

                                1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos + en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada + para manejo de softwares o

                                  +
                                  2. +

                                2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, + de poner a disposición a terceros, por un coste no superior al coste del + medio físico de almacenaje, una copia completa de los códigos fuente en + medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                                  +
                                  3. +

                                3. Esté acompañada con la misma información recibida en relación con la + oferta de la distribución del código fuente correspondiente (esta alternativa + solamente está permitida para distribuciones no comerciales y solamente + si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, + de acuerdo con la sección 2 arriba).

                                  +
                                  4. +
                                + El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones + en aquel trabajo. Cuando se habla en códigos fuentes completos significa + hablar de todos los fuentes de todos los módulos, además de las definiciones + de interfaces asociadas, archivos, scripts utilizados en la compilación + y instalación del ejecutable. Como una excepción excepcional, el código + fuente distribuido podrá no incluir algunos componentes que no se encuentren + en su escopo, como compilador, kernel, etc... para el SO donde el trabajo + sea ejecutado. + Si la distribución del ejecutable o objeto se hace, a través de acceso + a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente + de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos + con los objetos simultáneamente +
                                5. + +
                              5. +

                                No está permitida la copia, modificación, sublicenciamiento o distribución + del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier + tentativa de copia, modificación, sublicenciamiento o distribución del Programa + está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. + Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, + no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas + de esta Licencia.

                                6. +
                              6. +

                                No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá + documento o contrato que garantice permiso de modificación o distribución + del Programa o sus trabajos derivados. Estas acciones están prohibidas por + ley, en el caso de que no se acepten las condiciones de esta Licencia. La + modificación o distribución del Programa, o cualquier trabajo basado en éste, + implica en la aceptación de esta Licencia y de todos los términos de ésta + para copia, distribución o modificación del Programa o trabajos basados en + éste.

                                7. +
                              7. +

                                Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), + el recipiente automáticamente recibe una licencia del detentor original de + los derechos de copia, distribución o modificación del Programa objeto de + estos términos y condiciones. No pueden ser impuestas otras restricciones + en los recipientes.

                                8. + +
                              8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes + o derechos de autor, se impongan restricciones, que contradigan esta Licencia, + estos no exentan de su aplicación. Si no es posible distribuir el Programa + de forma a garantizar simultáneamente las obligaciones de esta Licencia y + otras que sean necesarias, entonces el Programa no podrá ser distribuido. +

                                Si esta Sección se considera, inválida por cualquier motivo particular + o general, su resultado implicará en la invalidación general de esta licencia + en la copia, modificación, sublicenciamiento o distribución del Programa + o trabajos basados en éste.

                                +

                                El propósito de esta sección no es, de forma alguna, incitar a quien quiera + que sea a infringir derechos reclamados en cuestiones válidas y procedentes, + y si proteger las premisas del sistema de libre distribución de software. + Muchas personas tienen hecho contribuciones generosas al sistema, en la + forma de programas, y es necesario garantizar la consistencia y credibilidad + del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución + de los softwares.

                                +

                                Esta sección pretende hacer claro los motivos que crearan las demás cláusulas + de estas Licencia.

                                9. + +
                              9. +

                                Si la distribución del Programa, dentro de los términos de esta Licencia, + tiene restricciones en algún País, por patentes o derechos de autor, el detentor + original de los derechos de autor del Programa bajo esta Licencia puede adicionar + explícitamente limitaciones geográficas de distribución, excluyendo aquellos + Países, haciendo con que la distribución solamente sea posible en los Países + no excluidos.

                                10. + +
                              10. +

                                La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) + puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública + General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos + objetivos y el espirito de la presente versión, pudiendo variar en detalles + referentes a nuevas situaciones encontradas.

                                +

                                A cada versión se da un número distinto. Si el Programa especifica, un + número de versión determinado de esta Licencia, que tenga en su contenido + la expresión ``o versión más actualizada'', es posible optar por las condiciones + de aquella versión o de cualquier versión más actualizada publicada por + la FSF.

                                11. + +
                              11. +

                                Si deseas incorporar parte del Programa en otros programas de libre distribución + de softwares hace falta autorización formal del autor. Para softwares que + la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde + que mantenido el espirito y objetivos originales de esta Licencia.

                                12. +
                              + +

                              AUSENCIA DE GARANTÍAS

                              +
                                +

                              1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER + GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE + EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS + DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, + LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD + Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS + CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y + REPAROS JUZGADOS NECESARIOS.

                                2. +

                              2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR + LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN + RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE + HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS + O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES + O DAÑOS.

                                +

                                FIN DE LA LICENCIA

                              + + +
                              +

                               

                              +

                              Apéndice

                              +

                              ¿Cómo aplicar estos términos a nuevos softwares?

                              +

                              Si has desarrollado un nuevo programa y deseas su amplia distribución para + el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, + que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                              +

                              Para esto basta con anexar este aviso al programa. Se recomienda indicar aún + en el inicio de cada archivo fuente la ausencia de garantías y una anotación + de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                              +

                              <nombre del programa y función> Copyright (C) 199X <Autor> +

                              +

                              Este programa es un software de libre distribución, que puede ser copiado + y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo + con la publicada por la Free Software Foundation, versión 2 de la licencia o + (a criterio del autor) cualquier versión posterior.

                              +

                              Este programa se distribuye en la expectativa de ser útil a sus usuarios, + pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE + ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General + 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. +

                              +

                              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:

                              +

                              Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares + NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software + de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. + Teclea 'muestra condic' para mayores detalles.

                              +

                              Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las + partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos + pueden variar o pueden ser accionados por otras interfaces como clic de ratón, + etc...

                              +

                               

                              +
                              +
                              + +www.conectiva.com + +
                              + + + + + diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt new file mode 100644 index 00000000000..3efbe1ccee7 --- /dev/null +++ b/htdocs/langs/nl_BE/html/gpl.txt @@ -0,0 +1,340 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +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 new file mode 100644 index 00000000000..778e2b02b41 --- /dev/null +++ b/htdocs/langs/nl_NL/html/gpl.txt @@ -0,0 +1,339 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van +deze licentie. \ No newline at end of file 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/ajax.lib.php b/htdocs/lib/ajax.lib.php index 7db1908bc49..55def736688 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ */ diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 49b67f9349a..1bdeb9562e6 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index eedd6a8841c..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/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index d6bf7267439..454073d9730 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 6e1e7b262f4..b5304ba4198 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index b0a7c2dece6..bda35165079 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.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/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ + * \version $Id$ */ if (session_id() == "") session_start(); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1da2adb751e..8bccf934120 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index a65f888ab11..efbd289cb3f 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ */ require("../main.inc.php"); @@ -1646,6 +1645,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); +llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 79601ea1031..8f373b577e8 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 8cf57ec0b64..724900dc500 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ + * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ */ require("../main.inc.php"); @@ -272,5 +271,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); +llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); ?> 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/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 78ca25e85a6..edb62d728d5 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $ + * \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index e78dff8f646..f93935ffb16 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.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/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ + * \version $Id$ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal 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 $'); ?> From 4f58d73bedcf7de6823d4e5176f8d361f6a09534 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 20:55:19 +0000 Subject: [PATCH 115/118] Fix: Trans --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/control.DEBIAN | 46 - build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 + build/deb/install | 1 + build/deb/po/fr.po | 22 +- build/deb/po/templates.pot | 20 +- build/deb/postinst | 100 +- build/deb/postrm | 119 +- build/deb/templates | 7 + build/makepack-dolibarr.pl | 204 +--- dev/skeletons/modMyModule.class.php | 4 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 35 +- htdocs/admin/perms.php | 34 +- htdocs/admin/proxy.php | 7 +- htdocs/admin/security_other.php | 7 +- htdocs/boxes.php | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/validation_verif.php | 3 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/compta/prelevement/create.php | 7 +- htdocs/contrat/fiche.php | 6 +- htdocs/core/class/conf.class.php | 6 +- htdocs/core/class/cookie.class.php | 5 +- htdocs/core/class/translate.class.php | 7 +- htdocs/filefunc.inc.php | 7 +- htdocs/imports/import.php | 7 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 ++++++++--------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/index.php | 7 +- htdocs/install/check.php | 5 +- htdocs/install/default.css | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 32 +- .../mysql/data/llx_20_c_departements.sql | 3 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/langs/es_ES/html/gpl.html | 330 ------ htdocs/langs/nl_BE/html/gpl.txt | 340 ------ htdocs/langs/nl_NL/html/gpl.txt | 339 ------ htdocs/lib/admin.lib.php | 77 +- htdocs/lib/ajax.lib.php | 5 +- htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 6 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- htdocs/societe/soc.php | 10 +- htdocs/theme/auguria/style.css.php | 5 +- .../smartphone/theme/default/default.css.php | 5 +- htdocs/user/group/perms.php | 34 +- htdocs/user/perms.php | 32 +- 341 files changed, 1624 insertions(+), 2822 deletions(-) delete mode 100755 build/deb/control.DEBIAN delete mode 100644 htdocs/langs/es_ES/html/gpl.html delete mode 100644 htdocs/langs/nl_BE/html/gpl.txt delete mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index edb46ffd5a3..d73d7a99219 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build package +# dpkg -b To build binary only package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# +# dpkg-reconfigure -plow package Reconfigure package # dpkg -L packagename List content of installed package +# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index b035f18ae1d..3382966714b 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 + -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN deleted file mode 100755 index 7c66775bdf1..00000000000 --- a/build/deb/control.DEBIAN +++ /dev/null @@ -1,46 +0,0 @@ -Package: dolibarr -Version: __VERSION__ -Architecture: all -Maintainer: Laurent Destailleur -Installed-Size: 61200 -Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl -Section: web -Priority: optional -Homepage: http://www.dolibarr.org -Description: Easy to use web based ERP & CRM software - Dolibarr ERP & CRM is an easy to use open source/free software for small - and medium companies, foundations or freelances. It includes different - features for Enterprise Resource Planning (ERP) and Customer Relationship - Management (CRM) but also for different other activities. - It's a web software you can install as a standalone program or on any web - hosting provider to use it from anywhere with any web browser. - Dolibarr was designed to provide only features you need and be easy to use. - . - Only features you need are visible, depending on which module were activated. - Most common used modules are: - . - Customers, Suppliers or Prospects directory, - Contacts directory, - Orders management, - Commercial proposals management, - Invoices management, - Products and services catalog, - Stock management, - Foundations members management, - Bank accounts management, - Point of Sale, - Payments management, - Commercial actions management, - Contracts management, - Standing orders management, - Shipping management, - Donations management, - Bookmarks management, - Mass Emailings, - Reports, - Wizards to export and import data, - LDAP connectivity, - PDF exports, - And a lot of more modules... - . - You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index 91f0705c001..e28258d8dbc 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,10 +4,16 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper, po-debconf +Build-Depends: debhelper (>= 7), po-debconf Package: dolibarr -Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, + php5-mysql | php5-mysqli, + php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, + ${misc:Depends}, xdg-utils, + mysql-server, perl +Recommends: apache2 | lighttpd | httpd, mysql-client +Suggests: www-browser Architecture: all Section: web Priority: optional diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index a48e5048dff..f4b471edf13 100644 --- a/build/deb/dolibarr.desktop +++ b/build/deb/dolibarr.desktop @@ -3,10 +3,14 @@ # It must be saved into directory /usr/share/applications Version=1.0 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM +Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations +Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/deb/install b/build/deb/install index 4d41fd52c65..2928d378abc 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,4 +1,5 @@ etc/dolibarr/apache.conf +etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 13b8030ed0d..3bbe762283a 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:49+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,10 +25,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "Seveur web à reconfigurer automatiquement:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" +"Selectionnez le serveur web à configurer automatiquement pour utiliser " +"dolibarr." + # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -36,7 +52,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index 32c92a97cc4..d65e5d8b7f6 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:52+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,15 +17,29 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: multiselect #. Description #: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:2001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index ca5fd1645dd..e0bba1be4da 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,7 +1,5 @@ #!/bin/sh # postinst script for dolibarr -# -# see: dh_installdeb(1) set -e @@ -16,6 +14,31 @@ set -e # for details, see /usr/share/doc/packaging-manual/ + + +lighttpd_install() { + if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + if which lighty-enable-mod >/dev/null 2>&1 ; then + echo "Add link for Lighttpd config file" + ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf + # We enabled it + lighty-enable-mod dolibarr fastcgi-php + else + echo "Lighttpd not installed, skipping" + fi + fi +} + +apache_install() { + webserver=$1 + if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Add link for Apache config file" + ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + . /usr/share/debconf/confmodule db_version 2.0 @@ -27,8 +50,6 @@ 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" @@ -44,10 +65,6 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir - # Copy apache.conf file into target directory - #mkdir -p /etc/dolibarr - #cp -p $apachefileorig $apacheconfig - # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -74,21 +91,15 @@ case "$1" in chmod -R 660 $config fi - # Get the web server type (use db_get for interactive mode). - #db_reset "dolibarr/webserver" - #db_get "dolibarr/webserver" # Read value for webserver. - #webserver="$RET" - - case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; - esac - + + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + # Set up web server. - for server in $webservers ; do - echo Complete config of server $server + for webserver in $webservers ; do + webserver=${webserver%,} + echo Complete config of server $webserver # Detect webuser and webgroup webuser= @@ -106,26 +117,31 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config - - # Add link to config file - echo Setup web server $server to add dolibarr config file - ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf - done - # Restart servers - servers="apache2-ssl apache2 mysql" - # Another way to restart - for server in $servers ; do - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $server reload || true - else - echo Restart web server $server using $server reload - /etc/init.d/$server reload || true - fi + # Restart web server. + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_install + else + apache_install $webserver + fi + # Reload webserver in any case, configuration might have changed + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $webserver reload 3>/dev/null || true + else + echo Restart web server $server using $server reload + /etc/init.d/$webserver reload 3>/dev/null || true + fi + fi done + echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -136,13 +152,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument $1" >&2 exit 0 ;; esac -db_stop - #DEBHELPER# +db_stop + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 9eae81b022b..27ce3777b7e 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,7 +17,36 @@ set -e # for details, see /usr/share/doc/packaging-manual/ -. /usr/share/debconf/confmodule + +lighttpd_remove() { + if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + echo "Remove link for Lighttpd config file" + rm -f /etc/lighttpd/conf-available/50-dolibarr.conf + if which lighty-enable-mod >/dev/null 2>&1 ; then + lighty-disable-mod dolibarr + else + echo "Lighttpd not installed, skipping" + fi + # See bug #448682 + if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then + echo 'Manually deleting lighttpd/dolibarr configuration link' + rm /etc/lighttpd/conf-enabled/50-dolibarr.conf + fi + fi +} + +apache_remove() { + if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Remove link for Apache config file" + rm -f /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi db_version 2.0 @@ -26,63 +55,62 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' -apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" -apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" -export webserver="" -# Allows us to loop and substitute in one pass -case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; -esac - case "$1" in # Call when we upgrade upgrade) + echo "postrm upgrade" ;; # Call when we uninstall remove) + echo "postrm remove" rm -f $lockfile - # 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" + # Reconfigure web server + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + + # Restart web servers + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_remove + else + apache_remove $webserver + fi + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload 3>/dev/null || true + else + /etc/init.d/$webserver reload 3>/dev/null || true + fi fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" + echo "postrm purge" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical "dolibarr/postrm" || true + db_input critical dolibarr/postrm || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get "dolibarr/postrm" + db_get dolibarr/postrm set -e if [ "$RET" = "true" ] ; then @@ -185,41 +213,12 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi - # Remove include files - export restart="" - for server in $webservers ; do - export conffile="/etc/$server/conf.d/dolibarr.conf" - if [ -f $conffile ] ; - then - echo Delete file $conffile - rm -f $conffile - status=purge - fi - - if [ "x$status" = "xpurge" ] ; - then restart="$restart $server" - fi - done - rm -rf /etc/dolibarr - # Restart servers - for server in $restart ; do - # We disable blocking errors - set +e - echo "Restart server $server if exists" - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $server reload || true - else - /etc/init.d/$server reload || true - fi - # We restore blocking errors - set -e - done - # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset "dolibarr/postrm" + db_reset dolibarr/reconfigure-webserver + db_reset dolibarr/postrm set -e #db_purge @@ -229,7 +228,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "postrm called with unknown argument $1" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index 5c06afd8ccd..b96325a4e64 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,3 +1,10 @@ +Template: dolibarr/reconfigure-webserver +Type: multiselect +Choices: apache2, lighttpd +_Description: Web server to reconfigure automatically: + Please choose the web server that should be automatically configured + to run dolibarr. + Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index d3c47e6b28d..f191d88c7f9 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.128 2011/07/31 22:08:13 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.121 2011/07/28 23:05:13 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -11,7 +11,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="1"; -$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="auto"; # auto use value found into BUILD @LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.121 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -254,18 +254,15 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliW*-*`; $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliM*-*`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.changes`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`; $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`; @@ -276,10 +273,6 @@ 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`; @@ -298,6 +291,11 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`; $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; $ret=`rm -fr $BUILDROOT/$PROJECT/document`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`; @@ -308,7 +306,6 @@ 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`; @@ -416,19 +413,14 @@ if ($nboftargetok) { } if ($target eq 'RPM') { # Linux only - #$ARCH='i386'; - $ARCH='noarch'; + $ARCH='i386'; if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; } $newbuild = $BUILD; - # For fedora - $newbuild =~ s/(dev|alpha)/0.1.a/gi; # dev - $newbuild =~ s/beta/0.2.beta1/gi; # beta - $newbuild =~ s/rc./0.3.rc1/gi; # rc + $newbuild =~ s/(dev|alpha)/0/gi; # dev + $newbuild =~ s/beta/1/gi; # beta + $newbuild =~ s/rc./2/gi; # rc if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale - #$newbuild =~ s/(dev|alpha)/0/gi; # dev - #$newbuild =~ s/beta/1/gi; # beta - #$newbuild =~ s/rc./2/gi; # rc - #if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale + # now newbuild is 0-0 or 0-3 for example $REL1 = $newbuild; $REL1 =~ s/-.*$//gi; if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; } print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; @@ -446,93 +438,16 @@ 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 -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$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`; @@ -560,10 +475,6 @@ 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; } @@ -614,33 +525,20 @@ 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`; @@ -700,7 +598,17 @@ if ($nboftargetok) { print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`; - # Set owners + #print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n"; + #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`; + + # copyright (to build binary package directly without sources. Useless if we build from sources) + #print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n"; + #$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`; + + # changelog (to build binary package directly without sources. Useless if we build from sources) + #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`; + #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`; + print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`; @@ -744,25 +652,29 @@ 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=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`; + $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"`; # 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`; @@ -778,18 +690,12 @@ if ($nboftargetok) { if ($OS =~ /windows/i) { print "Move *_all.deb to $DESTI\n"; - $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; - $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; - $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; - $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; + $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; } else { print "Move *_all.deb to $DESTI\n"; - $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; - $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; - $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; - $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; + $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; } next; } diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 3cc548e1c0a..d7172d651f0 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -27,7 +27,7 @@ * \file htdocs/includes/modules/modMyModule.class.php * \ingroup mymodule * \brief Description and activation file for module MyModule - * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $ + * \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); @@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='generic'; - // Defined if the directory /mymodule/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 718c842d046..34e7f48cea8 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -20,7 +20,7 @@ /** * \file htdocs/admin/boxes.php * \brief Page to setup boxes - * \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $ */ require("../main.inc.php"); @@ -278,7 +278,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -394,7 +394,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -470,5 +470,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $'); +llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $'); ?> diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index a907f47663a..671bd69a0e4 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2010 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ /** * \file htdocs/admin/modules.php * \brief Page to activate/disable all modules - * \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $ */ require("../main.inc.php"); @@ -79,12 +79,35 @@ $modules = array(); $orders = array(); $categ = array(); $dirmod = array(); +$modulesdir = array(); $i = 0; // is a sequencer of modules found $j = 0; // j is module number. Automatically affected if module number not defined. -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $althandle=@opendir($dirroot); + if (is_resource($althandle)) + { + while (($file = readdir($althandle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                              "; dol_syslog("Scan directory ".$dir." for modules"); @@ -449,5 +472,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $'); +llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $'); ?> diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index bee00b52906..6af9b54e7f0 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -21,7 +21,7 @@ * \file htdocs/admin/perms.php * \ingroup core * \brief Page d'administration/configuration des permissions par defaut - * \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $ + * \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $ */ require("../main.inc.php"); @@ -76,10 +76,34 @@ $db->begin(); // Charge les modules soumis a permissions $modules = array(); -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +$modulesdir = array(); +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                              "; $handle=@opendir($dir); @@ -194,5 +218,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $'); +llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $'); ?> diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 2c284c5cae8..f02e3d6203a 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ + * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -205,5 +206,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c1d629f7b7b..c0aaaa86213 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -347,5 +348,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/boxes.php b/htdocs/boxes.php index 2affdf654d3..d426e618377 100644 --- a/htdocs/boxes.php +++ b/htdocs/boxes.php @@ -22,7 +22,7 @@ * \brief File of class to manage widget boxes * \author Rodolphe Qiedeville * \author Laurent Destailleur - * \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $ */ @@ -220,7 +220,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php"); + $sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); } else { @@ -281,7 +281,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index c79d46fbeb5..698cceb4966 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,11 +11,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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ -/* \version $Id$ */ +/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index f91946e11c0..2d89cfd2388 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.js @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ // Instanciation et initialisation de l'objet xmlhttprequest diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index 1afc2d54b02..0d679c15b84 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -14,7 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ require('../main.inc.php'); diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 259dc4dbce5..96de90124f9 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -48,7 +47,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -67,7 +66,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -78,17 +77,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 0c262ba2936..5ba2ef8997e 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -385,5 +386,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 525160df9ef..9ee1f551048 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ + * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -607,5 +608,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index e05eaa66ecf..0efb704828f 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ + * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -1032,5 +1031,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index d2f2a7aae7e..5da397b4183 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ + * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ */ require('../main.inc.php'); @@ -673,5 +672,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); +llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); ?> diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 79d00ae00c7..689e2639773 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ + * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -275,5 +276,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); +llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 0cf91d64abc..b0145e14628 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -23,7 +23,7 @@ * \file htdocs/contrat/fiche.php * \ingroup contrat * \brief Page of a contract - * \version $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $ + * \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $ */ require ("../main.inc.php"); @@ -757,7 +757,7 @@ else $var=!$var; - if ($action != 'editline' || $_GET["rowid"] != $objp->rowid) + if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid) { print ''; // Libelle @@ -1286,5 +1286,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $'); +llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index acb0b5d9167..c5664164e74 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -24,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.63 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ */ @@ -144,13 +144,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard + $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard + $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/'; } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php index c21450bb8cb..07fed567b48 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,13 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index bf30794f153..4496c18ff1f 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -23,7 +23,7 @@ * \brief File for Tanslate class * \author Eric Seigne * \author Laurent Destailleur - * \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $ + * \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $ */ @@ -512,9 +512,10 @@ class Translate { * Return list of all available languages * @param langdir Directory to scan * @param maxlength Max length for each value in combo box (will be truncated) + * @param usecode Show code instead of country name for language variant * @return array List of languages */ - function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0) + function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0) { global $conf; @@ -527,7 +528,7 @@ class Translate { { $this->load("languages"); - if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE) + if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE)) { $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength); } diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 3148174f5af..13a97bf54b3 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,14 +20,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -64,7 +65,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 97d4d8252d3..c03b55d2347 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ + * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ */ require_once("../main.inc.php"); @@ -1668,7 +1669,7 @@ print '
                              '; $db->close(); -llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); +llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); /* diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 257b95e4e3c..6f6c7ed2a1b 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -65,7 +64,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.30 $'); + $ver=explode(' ','$Revision: 1.31 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 127eb16e389..446606ef055 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -64,7 +63,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
                              This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.27 $'); + $ver=explode(' ','$Revision: 1.28 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 9c90d1fcc94..46fa4c9ccc4 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,9 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* or see http://www.gnu.org/ +* along with this program. If not, see . */ /** @@ -22,7 +20,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id$ + * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -61,7 +59,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
                              This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision$'); + $ver=explode(' ','$Revision: 1.14 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index ec7e1af07c6..7055bef4b69 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php index 42780551928..c7bab37ad4b 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.10 2011/07/31 23:28:10 eldy Exp $ + * \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis 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/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 1; // Data directories to create when module is enabled diff --git a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index b1e3f5a2638..067e831b0b4 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,504 +1,503 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; If not, see . + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index b1e3f5a2638..e5f0ff4c0e5 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + License along with this library; If not, see . Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/index.php b/htdocs/index.php index f027e94a35a..5998094d362 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -573,7 +574,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); +llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9b19d9793fc..3724ef23d95 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 9978c8f437a..1d2084e7c7f 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: default.css,v 1.24 2011/08/03 01:32:42 eldy Exp $ */ body { diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 737e16cc10c..20ef1080e85 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ + * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index c9713870c22..5d7fca530f2 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index e7b45a476f1..d7df4ac6929 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 62e0a4a90cf..9a0dd0fcc43 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ + * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 50fa9904890..0037190af06 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 2e0fccb0051..6d19b01e197 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ + * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 223a2eb6d92..3050d37833c 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -74,12 +75,10 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -$lockfile = '../../install.lock'; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; -#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here -$lockfile = '../../install.lock'; + if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -179,7 +178,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists($lockfile)) +if (file_exists('../../install.lock')) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
                              '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index 841136fff8b..c786f91346c 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ + * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 9d08a56e41c..275298588e2 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 1f046a29bc4..1c43326d70f 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $ -- -- @@ -158,21 +158,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1); -- Regions Chile (id country=67) -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1); -- Regions San Salvador (id country=86) INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1); diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 9a109ab3fdc..e3963e8e68f 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $ -- -- @@ -566,6 +566,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1); +INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1); diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index 56ceea3d807..da244f79951 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index 3a248c2f49f..eee5dfa185a 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index dcbaf2faaf4..e3922b97f65 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index 1dd3cb59a62..b7f6c71c87e 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,10 +11,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index 5e93e39d048..f3299990858 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index e3ed8196d17..1f14cc8c142 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 176e5c796e2..5017ce0c60d 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index db630463dbf..f58db2b32a6 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index c67d263853d..079caa7dde4 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 07fa2abaa83..4bb81528e74 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index e29b3f306f5..720413ac480 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index c7fa6b6dd1f..cb0b557b438 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index 6a597996424..a3a19cc2125 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 78e174b9817..1ec498e6bc2 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a535a5098e..3a17978bb0c 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index f6395abbfcd..96d456312df 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 9c28f697f83..488b0a564eb 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index 988d9c26136..d8701c52c01 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ -- -- @@ -34,4 +33,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2d1a3c62a39..2fd47385a90 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index 4238000eb14..da98640fd25 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 6e596be24e5..789ad16fce2 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index e2faed3cba3..48b77951e1f 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index cf7e9e96275..59bd3d1ef00 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index 655848a50ae..cd2f27a5dca 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 968a131e2bb..42f86f1c447 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 6e6e960072b..685170362fd 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 02ff06ba9f1..921bc569980 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index f22262c9353..d5902b539c7 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index b2cdf08af5f..ddd3d734ff7 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 031bfb614e1..8c5c23bbe62 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index 3aa9555979e..f7b876eed86 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 4703aa32ddd..8d34e2a9c78 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index 69bf706ca68..ad6f448e3dc 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 9156b439833..51d66c04584 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index db64e0cbf9c..7df7f21a3b9 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index a7efcbd0f6d..31676d7d6e2 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index 7e4fa074e71..bc9d9ad0936 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index d23a1367f92..18eed730ab8 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index 2b2db5af657..ade41da746e 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index b5c9175202b..62a88236480 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 6ed1e00dd88..015a9e9b4c0 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index d1279c21eb2..296b49fc93f 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 822a69bc4ec..9cedf70e7ca 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index aba765190ee..55718d8ffb5 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index eded16c49fe..abc9baa2d8c 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index e39fbf71f12..3dd83585bcd 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 3710a87470a..217edcaddbb 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index ad41449f288..5869f24d8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index f6301a24919..5db17f19069 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index cd68a9cdb40..5f66ff625f0 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index 890c7597862..b0546729ef0 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index d67cf7fe4b8..4794113f8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5c06c73c69d..5fc25f57339 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 115bd310d70..5746cce26aa 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index d3c71cc4a70..ba1e56e2b94 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index 10c4cc2d853..de9c23e9c05 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,11 +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, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- --- $Id$ +-- $Id: llx_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index 09365976d78..cce9d04707b 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 463b1235094..93e8e3d99a7 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index c81a2b3e830..b0f31fe7116 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index 821fe3e5c04..cb2251cfaf6 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 9380607010d..8bebcf13116 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index e524d9c937a..b30354cae19 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index 0b0b34390c4..b026a40d762 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 7b5fa661d7d..39d21cee7b9 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index e2f225fe608..d1e6b216b4b 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 66cd5111325..60af7723f30 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index ebca12ab5da..cb223ae5532 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 3872bedd39d..415b8526793 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index bed4ad41dfc..5c54695f608 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 23cd0f575ed..93ef5d59770 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index f46d2a56c33..7702a8cf21e 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 4669de108f4..46a35567e95 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index a6bb8ca70f7..c2c43a3a625 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 5637e5a987d..547500d7f33 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index 884d8274cfd..bf7ed18af80 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index 2b6dea6cbd3..d0dceaf0fe1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 76aecebbb9a..192183be0c1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index 665a210d74b..d6d673962b9 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index 7fcd57e31eb..c8deefef6d7 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index e1cab3b3368..757653f1fc2 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f97e458be6b..f2fb7fda4d3 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 165a8550331..7a228ec1572 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 6efa388ef81..120e27ae77d 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index c8824b2d04e..a5e3fd8721b 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 311183c87f4..418e37a85b1 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 2d00f620e02..1cc5dbfaf0e 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 02052920c8a..84c72e0839b 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 0f608cbc171..8cf0ec900f8 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 75b40946559..2eed307bc54 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index 76caf44356d..c977dd9dd21 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 861671e3607..8307ca88eb6 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 46504e8a1c4..9a7bda88c28 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index dc284fc8cea..725ddbfeb90 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index 4f8736a3a14..a1feeb33f8b 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -13,8 +13,7 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -24,7 +23,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 85ea592d950..1e141b7768a 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 9fad6cc333e..79d54faf623 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index d6bd27758b4..97638937c74 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 40759cdc50b..211af70a854 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 80e73c43399..7c4c534451d 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index 4c466e0c02b..f2330322a5f 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 46a39b3c9e7..8e4492c28a9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 60641bf1876..39be52cf374 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index cfe126b5adf..e93ce9b4354 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index 7e12e06beb7..baa01289b96 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index 83eb804c875..bd19d25f1a5 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index 6236e113766..eb95b9fe66c 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index cf5121c34f9..2c95fde3255 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index cabdcce3a80..d62011351c4 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index ebaf9582414..a07ff049d61 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index fa9a85aac1f..730bc11ac98 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index ec8931763bf..6f129f2feec 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 7958b56f354..172a2432ee1 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ --- Supprimme orphelins pour permettre monte de la cl +-- Supprimme orphelins pour permettre mont�e de la cl� -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index 3f848c9ffe2..c13c0aa6019 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index df6d49827f6..f0c65456e5c 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index 9bb45f9d326..be4e60a9a97 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 91914ab66c7..23cfd068495 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b39863cab..d1b18165255 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index e964fbc2f5e..19ec675f973 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a747c714fb3..a53a24d9a66 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 16ecb365d6c..46639ca7c1e 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index bfce896eb19..d1ba0645e05 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index 51234007ee1..b7fc52403af 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index eead2907fa2..4187f526393 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 1c757fa6c86..7b74d8b506d 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ --- Supprimme orhpelins pour permettre monte de la cl +-- Supprimme orhpelins pour permettre mont�e de la cl� -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index 79b52ba399c..f1f4a75b604 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 3757e4522bf..39b89773316 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index f5987250001..98b29b1f715 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 9c4a5e340ab..0eb566317d0 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 906d0a3e2f4..3fb9f7d6d2d 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index 20bb329ff0e..ba595100b5f 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index 2063a310fb8..b71d2697b85 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index a99b42859c7..61d63046fac 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index f0e0a065089..0e20201f4cb 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 06af8a78575..154f0b51006 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1c5d5c30173..1dc4941012a 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index e43f4cb118c..a208aa5fff0 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index e4eb41f3bb4..f60029ee290 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 463675b10b7..2833920b746 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index fc998bd6edb..7987ca819c1 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index 1e9b0495d34..e027d471e23 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ +-- $Id: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index b899c4303e1..8b279dc578b 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 5d6d86617e6..684c5aa5a7c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index 6de1b23eb64..cdccf3eb6ec 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index 04491e0878c..fee45753759 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 575930a728c..9401f679071 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 46b769b8afc..757e8d2b447 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index e1b82141ea1..d0118ebdc6c 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 19824c860de..57d92bc8ce9 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 455916a3010..6f2ddcf56b9 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 94e726796c5..6cf13137710 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index 8dbbb572f29..cee3ace0ec3 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 923c2441987..34d0bbac03b 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index 88cf83a3cc3..ef97e48a251 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index 68e21d26061..b674a0cf11d 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index f289b9cb514..5e3620cba87 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index a2e54d34770..bd3c0c7d780 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index dbeec277f88..1524eb7a77b 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index e3e5900fb74..75a4ce8fd06 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index 0669065b7d3..eafe6bd31e1 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index dcca0174817..6a06c0c70b5 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index 99cf1edd744..d4aa4b26d99 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index 415b44c6a35..b55d734674f 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index ba8b40b3c0a..22a5b9d5c52 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 40e131fefdf..5edbea4808d 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index bc11ca42c8f..5313952606a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index 8d4a4ecdcbf..c210f906b9b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index f43ab1e746a..29598bb4963 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index a52d3ed4a8b..cfaad1061df 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 4e9f0d1da0e..521d666742d 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index c9891219f4f..29af17f7c08 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 6b8f7176dee..917d6fc5cdf 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 399dd175311..87245438b4d 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index c06074d4709..373267c8921 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index 1e3f21d0eb7..b67427b9de8 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 08450aa204f..8f00ee95200 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index 9b0104ccfe5..edc76a392b0 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 0782e089170..302248ae299 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 68b6cd9a315..9c741080a27 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 177be65fb88..4dd0ae15ad4 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index d573c90eb18..ffc0666074d 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index e0b2c2494ad..96f122e59cd 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 92000240642..4beccac04b8 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 6240a2ed5c0..484cebf6a2a 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index e2c4be38a5f..a56201f7dba 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 51e133a86dc..84f6077e5ba 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index aab9c69c1a7..46685416239 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index dc9732c0719..1d41d1ab59e 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index 663adaffe60..d6dd854a240 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 73dc6489461..0b7d6a61f56 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index 0b42446740b..c1ee00edd07 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index 7d728850185..d694d696801 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index d062249c3b8..925ca9eee81 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f33c92ea7fe..f67337de388 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 92f21a35f28..8c8454fbc28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index e62275df23d..6c673570cfc 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 29ad3853f90..9c05ed97a8d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Ocbo +-- Copyright (C) 2005 Marc Barilley / Oc�bo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b9ba378d81f..b127b194fa5 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 8771b0ddda8..5c8ea94ed09 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 8bb011f7280..94ba92d4856 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 1aba5d286d1..4017ae32682 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index e0c4fd61701..2c77ae3447c 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 1e721e86788..52c0a3e2a03 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index d4ea3ad5535..439b2a68098 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index 6f8d6a8cf97..f01b7d02e8e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index 854ec6e826e..bd1e805aed2 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index f1e90520593..bfc2162ceca 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 15d3bda5ba2..784e3d37507 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 66a61851cae..029bc528b6e 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 195d2464738..9c066c54436 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index 44a301a2db7..f4e38524d25 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index 237b5c23030..f03d92ce651 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 3bec7551161..2c9c2d929db 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index 45845593162..d9e9ecd43a7 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 672374961d5..01cabfec865 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index d8d9443595d..696cf49c337 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index f21fed4d1af..170bd56f390 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index a501b4db4b6..5a3d71b489a 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index 41a91a9aa5f..d29449c2503 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index e12dbc6fb12..86f114d395b 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index 1a83bee6508..ce320558709 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 93a28593f8e..76f76ff08ed 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index ec2bb01863b..133687c7466 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 552a985abd4..6ccd3aa39fb 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index 63b28ac8410..e24a8918c5b 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index e7ccde53858..26e451271cb 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index a1619df5cb5..40b07d29305 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index 309c60b660f..e21669e63d7 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index c92472f7af5..d094512d975 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index 3fb70995900..a75fb9aa76d 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ +-- $Id: llx_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index e7fc66a0ed6..a0d88737e3f 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 57b252ed2ea..9e28a37d6bb 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index b8453ea821c..376447586c9 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index 00268974476..e7528a03f28 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 16bf4dea7f0..4f994cf57aa 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index eff6387abee..1a7fdfd755f 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index f53599483a4..a618e3d8790 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index b9643f019c3..902f2b4fd5f 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index db4cdd2581c..1f5500e2eb1 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index 6bf45f749f5..c7d84e27326 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 7db41de673c..523eb3b37e0 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index 8dc4636c87e..bf057b4ad75 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index d500fc1b7cb..ade6a40a80d 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index a515ba541bf..bca670bbb98 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index b742b82dafc..7481589df00 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index fff909a0ec8..4adaa1a56ff 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index fb65e9b7e84..16631c76b76 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 332b1305d38..3df14473a7e 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index ca4206eb6fc..c3958313ea3 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 68e1d4f20e9..910d2ab2072 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 8714e7e4a07..5c7f2e9a59c 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index 7d3b0eecd98..cbaadb10091 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index 8bdd7193d1a..e88665b5a34 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 367d45e8525..86916c216a2 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 28b28aeb762..23065b261c8 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ +-- $Id: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index d78db14c30b..3f58eaf698b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 68e46fd120d..18924ff6ac5 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 6acb2db4585..8056a150fc3 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 838f502bfdb..1b5ea5516d4 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index f21099e9c5e..e61985c7dd1 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index f771be5ef5a..7bf81b7fbe9 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 0033bca36bc..1fb0d708dfa 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 8037c9cd7e5..6df43634ec4 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 99234b6660f..7b6cbd91645 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index dca8e80f856..810781ed6d9 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index f3a58aa1433..2e89f083575 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index 98c56c37567..fd656c736ef 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 100d9fe82b0..87f6416c6c5 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ -- ============================================================================ CREATE LANGUAGE plpgsql; diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html deleted file mode 100644 index 38e0f007a15..00000000000 --- a/htdocs/langs/es_ES/html/gpl.html +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - -H. Licencia Pública GNU - - - - - - - - - - - - - -

                              Licencia Pública GNU

                              - - - - -
                              - -GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 - -
                              - -

                              Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, - MA 02139, USA.

                              -

                              Está permitido, a cualquier persona, copiar y distribuir copias tal cual de - este documento de licencia, sin la introducción de cualquier cambio. -

                              - -
                              -

                              Introducción

                              -

                              Las licencias de muchos softwares se desarrollan para asegurar la libertad - de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, - al contrario, pretende garantizar la libertad de compartir y alterar softwares - de libre distribución - volviéndolos de libre distribución también para cualquier - de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares - de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla - (algunos softwares de la FSF son cubiertos por la GNU Library General Public - License).

                              -

                              Cuando nos referimos a softwares de libre distribución, nos referimos a la - libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar - la libertad de distribución de copias de softwares de libre distribución (y - cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos - fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se - hacen algunas restricciones, para asegurar los derechos de los programadores, - prohibiendo a todas las personas su negación o la solicitación de su abdicación. - Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución - o modificación del software.

                              -

                              Por ejemplo, al distribuirse copias de determinado programa, por una tasa - determinada o gratuitamente, se debe informar sobre todos los derechos incidentes - sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia - Pública General GNU.

                              -

                              La protección de los derechos envuelve dos pasos: (1) copyright del software - y (2) licencia que da permiso legal para copia, distribución y/o modificación - del softwares.

                              -

                              Aún para la protección de la FSF y del autor es importante que todos entiendan - que no hay garantías para softwares de libre distribución. Si software se modifica - por alguien y lo pasa adelante, este software no más reflejará el trabajo original - del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                              -

                              Finalmente, cualquier programa de libre distribución está constantemente amenazado - por las patentes de softwares. Buscamos evitar el peligro de que distribuidores - de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. - Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación - de patente se debe hacer permitiendo el uso por cualquier individuo, sin la - necesidad de licencia de uso.

                              -

                              Los términos y condiciones precisas para copia, distribución y modificación - siguen abajo:

                              -
                              -

                              Licencia Pública General GNU

                              -

                              TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN -

                              - -
                                - -

                              1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga - un aviso colocado por el detentor de los derechos de autor diciendo que aquel - podrá ser distribuido en las condiciones de la Licencia Pública General. El - Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado - en un Programa y significa tanto el propio Programa, como cualquier de los - trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, - un trabajo que contenga el Programa o una parte de este, en su forma original - o con modificaciones o traducido para una otra lengua (la traducción está - incluida sin limitaciones en el término ``modificación'').

                                -

                                Actividades distintas de copia, distribución y modificación no están cubiertas - por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa - no está restringido y la salida del Programa está cubierta solamente en - el caso de que su contenido contenga trabajos basados en el Programa (independientemente - de que hayan sido creados por la ejecución del Programa). Si esto es así, - depende de las funciones ejecutadas por el Programa.

                                2. - -

                              2. El código fuente del Programa, de la forma como fue recibido, puede ser - copiado y distribuido, en cualquier media, desde que sea providenciado un - aviso adecuado sobre los copyrights y la negación de garantías, y todos los - avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, - estén inalterados y que cualquier producto oriundo del Programa esté acompañado - de esta Licencia Pública General.

                                -

                                Está permitido el cobro de tasas por el acto físico de transferencia o - grabación de copias, y pueden ser dadas garantías y soporte en cambio del - cobro de valores.

                                3. - - -
                              3. -

                                Se puede modificar la copia o copias del Programa de cualquier forma que - se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir - tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                                - -
                                  -

                                1. Debe existir un aviso destacado de que los datos originales fueron alterados - en los archivos y las fechas de los cambios;

                                  2. - -

                                2. Debe existir un aviso de que el trabajo distribuido o publicado es, - de forma total o parcial, derivado del Programa o de alguna parte suya, - y que puede ser licenciado totalmente sin costes para terceros bajo los - términos de esta Licencia.

                                  3. - -

                                3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, - en el inicio de tu ejecución, presentar la información de copyright y - de ausencia de garantías (o de que la garantía es de responsabilidad de - terceros), y que los usuarios pueden redistribuir el programa bajo estas - condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                                  4. -
                                - - Estos requisitos se aplican a trabajos de modificación en general. Si - algunas secciones identificables no sean derivadas del Programa, y pueden - ser consideradas como partes independientes, entonces esta Licencia y sus - Términos no se aplican a aquellas secciones cuando distribuidas separadamente. - Pero al distribuir aquellas secciones como parte de un trabajo basado en - el Programa, la distribución, como un todo, debe contener los términos de - esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no - a cada una de las partes independientemente de quem los tenga desarrollado. - Más que tener intención de contestar los derechos sobre el trabajo desarrollado - por alguien, esta sección objetiva propiciar la correcta distribución de - trabajos derivados del Programa. - Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado - en él ni a un trabajo basado en él, a un volumen de almacenaje o media de - distribución no obliga la utilización de esta Licencia y de sus términos - al trabajo. -
                                4. - - -
                              4. -

                                Están permitidas, la copia y la distribución, del Programa (o un trabajo - basado en éste) en la forma de código objeto o ejecutable de acuerdo con los - términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                                - -
                                  -

                                1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos - en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada - para manejo de softwares o

                                  -
                                  2. -

                                2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, - de poner a disposición a terceros, por un coste no superior al coste del - medio físico de almacenaje, una copia completa de los códigos fuente en - medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                                  -
                                  3. -

                                3. Esté acompañada con la misma información recibida en relación con la - oferta de la distribución del código fuente correspondiente (esta alternativa - solamente está permitida para distribuciones no comerciales y solamente - si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, - de acuerdo con la sección 2 arriba).

                                  -
                                  4. -
                                - El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones - en aquel trabajo. Cuando se habla en códigos fuentes completos significa - hablar de todos los fuentes de todos los módulos, además de las definiciones - de interfaces asociadas, archivos, scripts utilizados en la compilación - y instalación del ejecutable. Como una excepción excepcional, el código - fuente distribuido podrá no incluir algunos componentes que no se encuentren - en su escopo, como compilador, kernel, etc... para el SO donde el trabajo - sea ejecutado. - Si la distribución del ejecutable o objeto se hace, a través de acceso - a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente - de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos - con los objetos simultáneamente -
                                5. - -
                              5. -

                                No está permitida la copia, modificación, sublicenciamiento o distribución - del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier - tentativa de copia, modificación, sublicenciamiento o distribución del Programa - está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. - Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, - no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas - de esta Licencia.

                                6. -
                              6. -

                                No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá - documento o contrato que garantice permiso de modificación o distribución - del Programa o sus trabajos derivados. Estas acciones están prohibidas por - ley, en el caso de que no se acepten las condiciones de esta Licencia. La - modificación o distribución del Programa, o cualquier trabajo basado en éste, - implica en la aceptación de esta Licencia y de todos los términos de ésta - para copia, distribución o modificación del Programa o trabajos basados en - éste.

                                7. -
                              7. -

                                Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), - el recipiente automáticamente recibe una licencia del detentor original de - los derechos de copia, distribución o modificación del Programa objeto de - estos términos y condiciones. No pueden ser impuestas otras restricciones - en los recipientes.

                                8. - -
                              8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes - o derechos de autor, se impongan restricciones, que contradigan esta Licencia, - estos no exentan de su aplicación. Si no es posible distribuir el Programa - de forma a garantizar simultáneamente las obligaciones de esta Licencia y - otras que sean necesarias, entonces el Programa no podrá ser distribuido. -

                                Si esta Sección se considera, inválida por cualquier motivo particular - o general, su resultado implicará en la invalidación general de esta licencia - en la copia, modificación, sublicenciamiento o distribución del Programa - o trabajos basados en éste.

                                -

                                El propósito de esta sección no es, de forma alguna, incitar a quien quiera - que sea a infringir derechos reclamados en cuestiones válidas y procedentes, - y si proteger las premisas del sistema de libre distribución de software. - Muchas personas tienen hecho contribuciones generosas al sistema, en la - forma de programas, y es necesario garantizar la consistencia y credibilidad - del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución - de los softwares.

                                -

                                Esta sección pretende hacer claro los motivos que crearan las demás cláusulas - de estas Licencia.

                                9. - -
                              9. -

                                Si la distribución del Programa, dentro de los términos de esta Licencia, - tiene restricciones en algún País, por patentes o derechos de autor, el detentor - original de los derechos de autor del Programa bajo esta Licencia puede adicionar - explícitamente limitaciones geográficas de distribución, excluyendo aquellos - Países, haciendo con que la distribución solamente sea posible en los Países - no excluidos.

                                10. - -
                              10. -

                                La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) - puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública - General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos - objetivos y el espirito de la presente versión, pudiendo variar en detalles - referentes a nuevas situaciones encontradas.

                                -

                                A cada versión se da un número distinto. Si el Programa especifica, un - número de versión determinado de esta Licencia, que tenga en su contenido - la expresión ``o versión más actualizada'', es posible optar por las condiciones - de aquella versión o de cualquier versión más actualizada publicada por - la FSF.

                                11. - -
                              11. -

                                Si deseas incorporar parte del Programa en otros programas de libre distribución - de softwares hace falta autorización formal del autor. Para softwares que - la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde - que mantenido el espirito y objetivos originales de esta Licencia.

                                12. -
                              - -

                              AUSENCIA DE GARANTÍAS

                              -
                                -

                              1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER - GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE - EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS - DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, - LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD - Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS - CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y - REPAROS JUZGADOS NECESARIOS.

                                2. -

                              2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR - LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN - RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE - HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS - O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES - O DAÑOS.

                                -

                                FIN DE LA LICENCIA

                              - - -
                              -

                               

                              -

                              Apéndice

                              -

                              ¿Cómo aplicar estos términos a nuevos softwares?

                              -

                              Si has desarrollado un nuevo programa y deseas su amplia distribución para - el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, - que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                              -

                              Para esto basta con anexar este aviso al programa. Se recomienda indicar aún - en el inicio de cada archivo fuente la ausencia de garantías y una anotación - de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                              -

                              <nombre del programa y función> Copyright (C) 199X <Autor> -

                              -

                              Este programa es un software de libre distribución, que puede ser copiado - y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo - con la publicada por la Free Software Foundation, versión 2 de la licencia o - (a criterio del autor) cualquier versión posterior.

                              -

                              Este programa se distribuye en la expectativa de ser útil a sus usuarios, - pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE - ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General - 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. -

                              -

                              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:

                              -

                              Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares - NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software - de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. - Teclea 'muestra condic' para mayores detalles.

                              -

                              Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las - partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos - pueden variar o pueden ser accionados por otras interfaces como clic de ratón, - etc...

                              -

                               

                              -
                              -
                              - -www.conectiva.com - -
                              - - - - - diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt deleted file mode 100644 index 3efbe1ccee7..00000000000 --- a/htdocs/langs/nl_BE/html/gpl.txt +++ /dev/null @@ -1,340 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -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 deleted file mode 100644 index 778e2b02b41..00000000000 --- a/htdocs/langs/nl_NL/html/gpl.txt +++ /dev/null @@ -1,339 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van -deze licentie. \ No newline at end of file diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index c2d47f668da..4092c55ff2d 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ /** * \file htdocs/lib/admin.lib.php * \brief Library of admin functions - * \version $Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis 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.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $ */ function security_prepare_head() { @@ -615,16 +615,41 @@ function Activate($value,$withdeps=1) // Activate module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } $objMod = new $modName($db); @@ -700,20 +725,46 @@ function UnActivate($value,$requiredby=1) $modName = $value; $ret=''; + $modulesdir=array(); // Desactivation du module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } if ($found) diff --git a/htdocs/lib/ajax.lib.php b/htdocs/lib/ajax.lib.php index 55def736688..7db1908bc49 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ */ diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1bdeb9562e6..49b67f9349a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 1d5b4951490..eedd6a8841c 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -29,7 +29,7 @@ * \ingroup core * \brief File that defines environment for all Dolibarr process (pages or scripts) * This script reads the conf file, init $lang, $db and and empty $user - * \version $Id: master.inc.php,v 1.351 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ */ @@ -70,14 +70,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root[]=$value; + $conf->file->dol_document_root['alt']=$value; } } diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index 454073d9730..d6bf7267439 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index b5304ba4198..6e1e7b262f4 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index bda35165079..b0a7c2dece6 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id$ + * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ */ if (session_id() == "") session_start(); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 8bccf934120..1da2adb751e 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ + * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index efbd289cb3f..a65f888ab11 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ + * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ */ require("../main.inc.php"); @@ -1645,6 +1646,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 8f373b577e8..79601ea1031 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 724900dc500..8cf57ec0b64 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ + * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ */ require("../main.inc.php"); @@ -271,5 +272,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); +llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); ?> diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 1dfd99cc99e..ec5d660daef 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -25,7 +25,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.125 2011/07/31 23:22:57 eldy Exp $ + * \version $Id: soc.php,v 1.126 2011/08/01 00:38:49 eldy Exp $ */ require("../main.inc.php"); @@ -587,7 +587,8 @@ else if ($conf->fournisseur->enabled && (GETPOST("type")=='f' || GETPOST("type")=='')) { $object->fournisseur=1; } if (GETPOST("private")==1) { $object->particulier=1; } - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prenom=$_POST["prenom"]; $object->particulier=$_REQUEST["private"]; $object->prefix_comm=$_POST["prefix_comm"]; @@ -1093,7 +1094,8 @@ else if (! empty($_POST["nom"])) { // We overwrite with values if posted - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prefix_comm=$_POST["prefix_comm"]; $object->client=$_POST["client"]; $object->code_client=$_POST["code_client"]; @@ -1967,5 +1969,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.125 $'); +llxFooter('$Date: 2011/08/01 00:38:49 $ - $Revision: 1.126 $'); ?> \ No newline at end of file diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index edb62d728d5..78ca25e85a6 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $ + * \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index f93935ffb16..e78dff8f646 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id$ + * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index e4e52c611b4..9edcafd59c0 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/group/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.39 2011/07/31 23:21:25 eldy Exp $ + * \version $Id: perms.php,v 1.40 2011/08/01 13:15:53 hregis Exp $ */ require("../../main.inc.php"); @@ -93,10 +93,34 @@ if ($_GET["id"]) // Charge les modules soumis a permissions $modules = array(); - foreach ($conf->file->dol_document_root as $dirroot) + $modulesdir = array(); + + foreach ($conf->file->dol_document_root as $type => $dirroot) + { + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } + + foreach ($modulesdir as $dir) { - $dir = $dirroot . "/includes/modules/"; - // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                              "; $handle=@opendir($dir); @@ -292,5 +316,5 @@ if ($_GET["id"]) $db->close(); -llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.39 $'); +llxFooter('$Date: 2011/08/01 13:15:53 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index adb7fa764b6..47710b31d9d 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.56 2011/07/31 23:19:42 eldy Exp $ + * \version $Id: perms.php,v 1.57 2011/08/01 13:15:54 hregis Exp $ */ require("../main.inc.php"); @@ -120,12 +120,34 @@ $db->begin(); // Search all modules with permission and reload permissions def. $modules = array(); +$modulesdir = array(); -$listdir=$conf->file->dol_document_root; -foreach($listdir as $dirroot) +foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir=$dirroot."/includes/modules/"; + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} +foreach($modulesdir as $dir) +{ $handle=opendir($dir); if (is_resource($handle)) { @@ -373,5 +395,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.56 $'); +llxFooter('$Date: 2011/08/01 13:15:54 $ - $Revision: 1.57 $'); ?> From 474108403cd852c0df02d00d247442d4b7751609 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Aug 2011 00:38:49 +0000 Subject: [PATCH 116/118] Fix: bug #33900 : Third party name reset after the autocompletion of city name --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/control.DEBIAN | 46 + build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 - build/deb/install | 1 - build/deb/po/fr.po | 22 +- build/deb/po/templates.pot | 20 +- build/deb/postinst | 100 +- build/deb/postrm | 119 +- build/deb/templates | 7 - build/makepack-dolibarr.pl | 204 +++- dev/skeletons/modMyModule.class.php | 4 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 33 +- htdocs/admin/perms.php | 32 +- htdocs/admin/proxy.php | 7 +- htdocs/admin/security_other.php | 7 +- htdocs/boxes.php | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/validation_verif.php | 3 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/compta/prelevement/create.php | 7 +- htdocs/contrat/fiche.php | 6 +- htdocs/core/class/conf.class.php | 6 +- htdocs/core/class/cookie.class.php | 5 +- htdocs/core/class/translate.class.php | 7 +- htdocs/filefunc.inc.php | 7 +- htdocs/imports/import.php | 7 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 +++++++++-------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/index.php | 7 +- htdocs/install/check.php | 5 +- htdocs/install/default.css | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 32 +- .../mysql/data/llx_20_c_departements.sql | 3 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/langs/es_ES/html/gpl.html | 330 ++++++ htdocs/langs/nl_BE/html/gpl.txt | 340 ++++++ htdocs/langs/nl_NL/html/gpl.txt | 339 ++++++ htdocs/lib/admin.lib.php | 77 +- htdocs/lib/ajax.lib.php | 5 +- htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 6 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- htdocs/theme/auguria/style.css.php | 5 +- .../smartphone/theme/default/default.css.php | 5 +- htdocs/user/group/perms.php | 34 +- htdocs/user/perms.php | 32 +- 340 files changed, 2816 insertions(+), 1616 deletions(-) create mode 100755 build/deb/control.DEBIAN create mode 100644 htdocs/langs/es_ES/html/gpl.html create mode 100644 htdocs/langs/nl_BE/html/gpl.txt create mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index d73d7a99219..edb46ffd5a3 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,13 +22,12 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build binary only package +# dpkg -b To build package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# dpkg-reconfigure -plow package Reconfigure package +# # dpkg -L packagename List content of installed package -# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index 3382966714b..b035f18ae1d 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 + -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN new file mode 100755 index 00000000000..7c66775bdf1 --- /dev/null +++ b/build/deb/control.DEBIAN @@ -0,0 +1,46 @@ +Package: dolibarr +Version: __VERSION__ +Architecture: all +Maintainer: Laurent Destailleur +Installed-Size: 61200 +Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Section: web +Priority: optional +Homepage: http://www.dolibarr.org +Description: Easy to use web based ERP & CRM software + Dolibarr ERP & CRM is an easy to use open source/free software for small + and medium companies, foundations or freelances. It includes different + features for Enterprise Resource Planning (ERP) and Customer Relationship + Management (CRM) but also for different other activities. + It's a web software you can install as a standalone program or on any web + hosting provider to use it from anywhere with any web browser. + Dolibarr was designed to provide only features you need and be easy to use. + . + Only features you need are visible, depending on which module were activated. + Most common used modules are: + . + Customers, Suppliers or Prospects directory, + Contacts directory, + Orders management, + Commercial proposals management, + Invoices management, + Products and services catalog, + Stock management, + Foundations members management, + Bank accounts management, + Point of Sale, + Payments management, + Commercial actions management, + Contracts management, + Standing orders management, + Shipping management, + Donations management, + Bookmarks management, + Mass Emailings, + Reports, + Wizards to export and import data, + LDAP connectivity, + PDF exports, + And a lot of more modules... + . + You can also add third parties external modules or develop yours. diff --git a/build/deb/control.debian b/build/deb/control.debian index e28258d8dbc..91f0705c001 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,16 +4,10 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper (>= 7), po-debconf +Build-Depends: debhelper, po-debconf Package: dolibarr -Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, - php5-mysql | php5-mysqli, - php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, - ${misc:Depends}, xdg-utils, - mysql-server, perl -Recommends: apache2 | lighttpd | httpd, mysql-client -Suggests: www-browser +Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl Architecture: all Section: web Priority: optional diff --git a/build/deb/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 b/build/deb/install index 2928d378abc..4d41fd52c65 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,5 +1,4 @@ etc/dolibarr/apache.conf -etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 3bbe762283a..13b8030ed0d 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:49+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,26 +25,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Seveur web à reconfigurer automatiquement:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"dolibarr." -msgstr "" -"Selectionnez le serveur web à configurer automatiquement pour utiliser " -"dolibarr." - # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -52,7 +36,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index d65e5d8b7f6..32c92a97cc4 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,29 +17,15 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"dolibarr." -msgstr "" - #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index e0bba1be4da..ca5fd1645dd 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,5 +1,7 @@ #!/bin/sh # postinst script for dolibarr +# +# see: dh_installdeb(1) set -e @@ -14,31 +16,6 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - - -lighttpd_install() { - if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - if which lighty-enable-mod >/dev/null 2>&1 ; then - echo "Add link for Lighttpd config file" - ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf - # We enabled it - lighty-enable-mod dolibarr fastcgi-php - else - echo "Lighttpd not installed, skipping" - fi - fi -} - -apache_install() { - webserver=$1 - if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Add link for Apache config file" - ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - . /usr/share/debconf/confmodule db_version 2.0 @@ -50,6 +27,8 @@ echo Run the dolibarr postinst script # Define vars docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" installconfig="/etc/dolibarr/install.forced.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php" @@ -65,6 +44,10 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir + # Copy apache.conf file into target directory + #mkdir -p /etc/dolibarr + #cp -p $apachefileorig $apacheconfig + # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -91,15 +74,21 @@ case "$1" in chmod -R 660 $config fi - - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - + # Get the web server type (use db_get for interactive mode). + #db_reset "dolibarr/webserver" + #db_get "dolibarr/webserver" # Read value for webserver. + #webserver="$RET" + + case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; + esac + # Set up web server. - for webserver in $webservers ; do - webserver=${webserver%,} - echo Complete config of server $webserver + for server in $webservers ; do + echo Complete config of server $server # Detect webuser and webgroup webuser= @@ -117,31 +106,26 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config + + # Add link to config file + echo Setup web server $server to add dolibarr config file + ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf + done - # Restart web server. - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_install - else - apache_install $webserver - fi - # Reload webserver in any case, configuration might have changed - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $webserver reload 3>/dev/null || true - else - echo Restart web server $server using $server reload - /etc/init.d/$webserver reload 3>/dev/null || true - fi - fi + # Restart servers + servers="apache2-ssl apache2 mysql" + # Another way to restart + for server in $servers ; do + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $server reload || true + else + echo Restart web server $server using $server reload + /etc/init.d/$server reload || true + fi done - echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -152,13 +136,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument $1" >&2 + echo "postinst called with unknown argument \`$1'" >&2 exit 0 ;; esac -#DEBHELPER# - db_stop +#DEBHELPER# + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 27ce3777b7e..9eae81b022b 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,36 +17,7 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - -lighttpd_remove() { - if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then - echo "Remove link for Lighttpd config file" - rm -f /etc/lighttpd/conf-available/50-dolibarr.conf - if which lighty-enable-mod >/dev/null 2>&1 ; then - lighty-disable-mod dolibarr - else - echo "Lighttpd not installed, skipping" - fi - # See bug #448682 - if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then - echo 'Manually deleting lighttpd/dolibarr configuration link' - rm /etc/lighttpd/conf-enabled/50-dolibarr.conf - fi - fi -} - -apache_remove() { - if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then - echo "Remove link for Apache config file" - rm -f /etc/$webserver/conf.d/dolibarr.conf - fi -} - - - -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule -fi +. /usr/share/debconf/confmodule db_version 2.0 @@ -55,62 +26,63 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" +export webserver="" +# Allows us to loop and substitute in one pass +case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; +esac + case "$1" in # Call when we upgrade upgrade) - echo "postrm upgrade" ;; # Call when we uninstall remove) - echo "postrm remove" rm -f $lockfile - # Reconfigure web server - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - - # Restart web servers - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_remove - else - apache_remove $webserver - fi - # Redirection of 3 is needed because Debconf uses it and it might - # be inherited by webserver. See bug #446324. - if [ -f /etc/init.d/$webserver ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $webserver reload 3>/dev/null || true - else - /etc/init.d/$webserver reload 3>/dev/null || true - fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete link $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge" + echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical dolibarr/postrm || true + db_input critical "dolibarr/postrm" || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get dolibarr/postrm + db_get "dolibarr/postrm" set -e if [ "$RET" = "true" ] ; then @@ -213,12 +185,41 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete file $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" + fi + done + rm -rf /etc/dolibarr + # Restart servers + for server in $restart ; do + # We disable blocking errors + set +e + echo "Restart server $server if exists" + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $server reload || true + else + /etc/init.d/$server reload || true + fi + # We restore blocking errors + set -e + done + # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset dolibarr/reconfigure-webserver - db_reset dolibarr/postrm + db_reset "dolibarr/postrm" set -e #db_purge @@ -228,7 +229,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument $1" >&2 + echo "postrm called with unknown argument \`$1'" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index b96325a4e64..5c06afd8ccd 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,10 +1,3 @@ -Template: dolibarr/reconfigure-webserver -Type: multiselect -Choices: apache2, lighttpd -_Description: Web server to reconfigure automatically: - Please choose the web server that should be automatically configured - to run dolibarr. - Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index f191d88c7f9..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.121 2011/07/28 23:05:13 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.121 $'; $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,6 +276,10 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mssql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`; @@ -291,11 +298,6 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`; $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; $ret=`rm -fr $BUILDROOT/$PROJECT/document`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`; @@ -306,6 +308,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; @@ -413,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"; @@ -438,16 +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/$PROJECT.tmp/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + # To remove once stable + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + + # Apache conf files + #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + + # Dolibarr conf files + # TODO + + # dolibarr.desktop + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; + #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; + #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; + + # pixmap + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; + #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; + #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; + + # Set owners + print "Set owners on files/dir\n"; + $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; + + print "Set permissions on files/dir\n"; + $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; + $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + + # Build tgz print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n"; $ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; @@ -475,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; } @@ -525,20 +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`; @@ -598,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`; @@ -652,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`; @@ -690,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; } 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/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/proxy.php b/htdocs/admin/proxy.php index f02e3d6203a..2c284c5cae8 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ */ require("../main.inc.php"); @@ -206,5 +205,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); +llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c0aaaa86213..c1d629f7b7b 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ */ require("../main.inc.php"); @@ -348,5 +347,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); +llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); ?> 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/css/style.css b/htdocs/cashdesk/css/style.css index 698cceb4966..c79d46fbeb5 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,10 +11,11 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ +/* \version $Id$ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index 2d89cfd2388..f91946e11c0 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.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. */ // Instanciation et initialisation de l'objet xmlhttprequest diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index 0d679c15b84..1afc2d54b02 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ require('../main.inc.php'); diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 96de90124f9..259dc4dbce5 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -47,7 +48,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -66,7 +67,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -77,17 +78,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 5ba2ef8997e..0c262ba2936 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ */ require("./pre.inc.php"); @@ -386,5 +385,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); +llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 9ee1f551048..525160df9ef 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ */ require("./pre.inc.php"); @@ -608,5 +607,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); +llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); ?> diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 0efb704828f..e05eaa66ecf 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ + * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ */ require('../main.inc.php'); @@ -1031,5 +1032,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); +llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 5da397b4183..d2f2a7aae7e 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ + * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ */ require('../main.inc.php'); @@ -672,5 +673,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); +llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); ?> diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 689e2639773..79d00ae00c7 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ + * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -276,5 +275,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); +llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); ?> diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index b0145e14628..0cf91d64abc 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -23,7 +23,7 @@ * \file htdocs/contrat/fiche.php * \ingroup contrat * \brief Page of a contract - * \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $ + * \version $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $ */ require ("../main.inc.php"); @@ -757,7 +757,7 @@ else $var=!$var; - if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid) + if ($action != 'editline' || $_GET["rowid"] != $objp->rowid) { print ''; // Libelle @@ -1286,5 +1286,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $'); +llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index c5664164e74..acb0b5d9167 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -24,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ + * \version $Id: conf.class.php,v 1.63 2011/07/31 23:45:13 eldy Exp $ */ @@ -144,13 +144,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 07fed567b48..c21450bb8cb 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ + * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 4496c18ff1f..bf30794f153 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -23,7 +23,7 @@ * \brief File for Tanslate class * \author Eric Seigne * \author Laurent Destailleur - * \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $ + * \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $ */ @@ -512,10 +512,9 @@ class Translate { * Return list of all available languages * @param langdir Directory to scan * @param maxlength Max length for each value in combo box (will be truncated) - * @param usecode Show code instead of country name for language variant * @return array List of languages */ - function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0) + function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0) { global $conf; @@ -528,7 +527,7 @@ class Translate { { $this->load("languages"); - if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE)) + if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE) { $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength); } diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 13a97bf54b3..3148174f5af 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,15 +20,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -65,7 +64,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index c03b55d2347..97d4d8252d3 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ + * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ */ require_once("../main.inc.php"); @@ -1669,7 +1668,7 @@ print '
                              '; $db->close(); -llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); +llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); /* diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 6f6c7ed2a1b..257b95e4e3c 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -64,7 +65,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.31 $'); + $ver=explode(' ','$Revision: 1.30 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 446606ef055..127eb16e389 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** @@ -20,7 +21,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -63,7 +64,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
                              This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.28 $'); + $ver=explode(' ','$Revision: 1.27 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 46fa4c9ccc4..9c90d1fcc94 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,7 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program. If not, see . +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* or see http://www.gnu.org/ */ /** @@ -20,7 +22,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -59,7 +61,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
                              This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.14 $'); + $ver=explode(' ','$Revision$'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index 7055bef4b69..ec7e1af07c6 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ + * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/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/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index 067e831b0b4..b1e3f5a2638 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,503 +1,504 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index e5f0ff4c0e5..b1e3f5a2638 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,7 +484,8 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/index.php b/htdocs/index.php index 5998094d362..f027e94a35a 100644 --- a/htdocs/index.php +++ b/htdocs/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/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -574,7 +573,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); +llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 3724ef23d95..9b19d9793fc 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 1d2084e7c7f..9978c8f437a 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/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.24 2011/08/03 01:32:42 eldy Exp $ + * $Id$ */ body { diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 20ef1080e85..737e16cc10c 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 5d7fca530f2..c9713870c22 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index d7df4ac6929..e7b45a476f1 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 9a0dd0fcc43..62e0a4a90cf 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 0037190af06..50fa9904890 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ + * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 6d19b01e197..2e0fccb0051 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 3050d37833c..223a2eb6d92 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -75,10 +74,12 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +$lockfile = '../../install.lock'; +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; - +#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here +$lockfile = '../../install.lock'; if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -178,7 +179,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists('../../install.lock')) +if (file_exists($lockfile)) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
                              '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index c786f91346c..841136fff8b 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 275298588e2..9d08a56e41c 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,9 +17,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_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 1c43326d70f..1f046a29bc4 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ -- -- @@ -158,21 +158,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1); -- Regions Chile (id country=67) -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1); -- Regions San Salvador (id country=86) INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1); diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index e3963e8e68f..9a109ab3fdc 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ -- -- @@ -566,7 +566,6 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1); diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index da244f79951..56ceea3d807 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,9 +17,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_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index eee5dfa185a..3a248c2f49f 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,9 +18,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_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index e3922b97f65..dcbaf2faaf4 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,9 +17,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_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index b7f6c71c87e..1dd3cb59a62 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,9 +11,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_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index f3299990858..5e93e39d048 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,9 +17,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_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index 1f14cc8c142..e3ed8196d17 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,9 +17,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_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 5017ce0c60d..176e5c796e2 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,9 +17,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_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index f58db2b32a6..db630463dbf 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,9 +17,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_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index 079caa7dde4..c67d263853d 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,9 +17,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_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 4bb81528e74..07fa2abaa83 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,9 +18,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_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index 720413ac480..e29b3f306f5 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,9 +17,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_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index cb0b557b438..c7fa6b6dd1f 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.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_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index a3a19cc2125..6a597996424 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,9 +17,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_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 1ec498e6bc2..78e174b9817 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,9 +17,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_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a17978bb0c..3a535a5098e 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,9 +17,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_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index 96d456312df..f6395abbfcd 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,9 +17,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_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 488b0a564eb..9c28f697f83 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,9 +17,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_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index d8701c52c01..988d9c26136 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,9 +17,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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- @@ -33,4 +34,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2fd47385a90..2d1a3c62a39 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,9 +17,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_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index da98640fd25..4238000eb14 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,9 +17,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_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 789ad16fce2..6e596be24e5 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,9 +17,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_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index 48b77951e1f..e2faed3cba3 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,9 +17,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_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index 59bd3d1ef00..cf7e9e96275 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,9 +17,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_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ +-- $Id$ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index cd2f27a5dca..655848a50ae 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.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: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 42f86f1c447..968a131e2bb 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -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: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 685170362fd..6e6e960072b 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.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_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 921bc569980..02ff06ba9f1 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.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_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index d5902b539c7..f22262c9353 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.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_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index ddd3d734ff7..b2cdf08af5f 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.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_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 8c5c23bbe62..031bfb614e1 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -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: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index f7b876eed86..3aa9555979e 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -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: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 8d34e2a9c78..4703aa32ddd 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -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: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index ad6f448e3dc..69bf706ca68 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,9 +15,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_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 51d66c04584..9156b439833 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,9 +15,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_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index 7df7f21a3b9..db64e0cbf9c 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -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: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index 31676d7d6e2..a7efcbd0f6d 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -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: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index bc9d9ad0936..7e4fa074e71 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -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: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index 18eed730ab8..d23a1367f92 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index ade41da746e..2b2db5af657 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.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_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index 62a88236480..b5c9175202b 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 015a9e9b4c0..6ed1e00dd88 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.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_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index 296b49fc93f..d1279c21eb2 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 9cedf70e7ca..822a69bc4ec 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.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_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index 55718d8ffb5..aba765190ee 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.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_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index abc9baa2d8c..eded16c49fe 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -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: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index 3dd83585bcd..e39fbf71f12 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -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: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 217edcaddbb..3710a87470a 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -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: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index 5869f24d8bd..ad41449f288 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -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: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index 5db17f19069..f6301a24919 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index 5f66ff625f0..cd68a9cdb40 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.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_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index b0546729ef0..890c7597862 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.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_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index 4794113f8bd..d67cf7fe4b8 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -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: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5fc25f57339..5c06c73c69d 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 5746cce26aa..115bd310d70 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.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_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index ba1e56e2b94..d3c71cc4a70 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.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_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index de9c23e9c05..10c4cc2d853 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,10 +13,11 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, 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_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index cce9d04707b..09365976d78 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.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_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 93e8e3d99a7..463b1235094 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -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: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index b0f31fe7116..c81a2b3e830 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -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: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index cb2251cfaf6..821fe3e5c04 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -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: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 8bebcf13116..9380607010d 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index b30354cae19..e524d9c937a 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.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_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index b026a40d762..0b0b34390c4 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -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: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 39d21cee7b9..7b5fa661d7d 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -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: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index d1e6b216b4b..e2f225fe608 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.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_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 60af7723f30..66cd5111325 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -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: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index cb223ae5532..ebca12ab5da 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -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: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 415b8526793..3872bedd39d 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -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: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index 5c54695f608..bed4ad41dfc 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 93ef5d59770..23cd0f575ed 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.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_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index 7702a8cf21e..f46d2a56c33 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.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_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 46a35567e95..4669de108f4 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.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_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index c2c43a3a625..a6bb8ca70f7 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -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: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 547500d7f33..5637e5a987d 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -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: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index bf7ed18af80..884d8274cfd 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.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_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index d0dceaf0fe1..2b6dea6cbd3 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -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: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 192183be0c1..76aecebbb9a 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -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: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index d6d673962b9..665a210d74b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -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: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index c8deefef6d7..7fcd57e31eb 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -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: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index 757653f1fc2..e1cab3b3368 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -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: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f2fb7fda4d3..f97e458be6b 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -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: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 7a228ec1572..165a8550331 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -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: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 120e27ae77d..6efa388ef81 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.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_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index a5e3fd8721b..c8824b2d04e 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.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_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 418e37a85b1..311183c87f4 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.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_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 1cc5dbfaf0e..2d00f620e02 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -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: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 84c72e0839b..02052920c8a 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -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: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 8cf0ec900f8..0f608cbc171 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.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_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 2eed307bc54..75b40946559 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.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_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index c977dd9dd21..76caf44356d 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.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_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 8307ca88eb6..861671e3607 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -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: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 9a7bda88c28..46504e8a1c4 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -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: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index 725ddbfeb90..dc284fc8cea 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -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: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index a1feeb33f8b..4f8736a3a14 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -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. -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -23,7 +24,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 1e141b7768a..85ea592d950 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -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: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 79d54faf623..9fad6cc333e 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -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: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index 97638937c74..d6bd27758b4 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -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: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 211af70a854..40759cdc50b 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.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_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 7c4c534451d..80e73c43399 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -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: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index f2330322a5f..4c466e0c02b 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -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: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 8e4492c28a9..46a39b3c9e7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -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: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 39be52cf374..60641bf1876 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -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: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index e93ce9b4354..cfe126b5adf 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.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_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index baa01289b96..7e12e06beb7 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -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: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index bd19d25f1a5..83eb804c875 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -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: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index eb95b9fe66c..6236e113766 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -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: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index 2c95fde3255..cf5121c34f9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -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: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index d62011351c4..cabdcce3a80 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index a07ff049d61..ebaf9582414 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.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_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index 730bc11ac98..fa9a85aac1f 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -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: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index 6f129f2feec..ec8931763bf 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -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: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 172a2432ee1..7958b56f354 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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. -- --- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orphelins pour permettre mont�e de la cl� +-- Supprimme orphelins pour permettre monte de la cl -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index c13c0aa6019..3f848c9ffe2 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index f0c65456e5c..df6d49827f6 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.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_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index be4e60a9a97..9bb45f9d326 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -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: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 23cfd068495..91914ab66c7 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -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: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b18165255..d1b39863cab 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -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: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index 19ec675f973..e964fbc2f5e 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -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: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a53a24d9a66..a747c714fb3 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.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_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 46639ca7c1e..16ecb365d6c 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.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_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index d1ba0645e05..bfce896eb19 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.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_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index b7fc52403af..51234007ee1 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.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_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index 4187f526393..eead2907fa2 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,9 +15,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_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 7b74d8b506d..1c757fa6c86 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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. -- --- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- ============================================================================ --- Supprimme orhpelins pour permettre mont�e de la cl� +-- Supprimme orhpelins pour permettre monte de la cl -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index f1f4a75b604..79b52ba399c 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -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: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 39b89773316..3757e4522bf 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -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: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index 98b29b1f715..f5987250001 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -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: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 0eb566317d0..9c4a5e340ab 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 3fb9f7d6d2d..906d0a3e2f4 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.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_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index ba595100b5f..20bb329ff0e 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index b71d2697b85..2063a310fb8 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.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_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index 61d63046fac..a99b42859c7 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -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: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index 0e20201f4cb..f0e0a065089 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.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_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 154f0b51006..06af8a78575 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.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_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1dc4941012a..1c5d5c30173 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -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: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index a208aa5fff0..e43f4cb118c 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -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: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index f60029ee290..e4eb41f3bb4 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.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_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 2833920b746..463675b10b7 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -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: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index 7987ca819c1..fc998bd6edb 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.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_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index e027d471e23..1e9b0495d34 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -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: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ +-- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index 8b279dc578b..b899c4303e1 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.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_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 684c5aa5a7c..5d6d86617e6 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -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: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index cdccf3eb6ec..6de1b23eb64 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.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_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index fee45753759..04491e0878c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -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: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 9401f679071..575930a728c 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -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: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 757e8d2b447..46b769b8afc 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.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_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index d0118ebdc6c..e1b82141ea1 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 57d92bc8ce9..19824c860de 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.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_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 6f2ddcf56b9..455916a3010 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.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_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 6cf13137710..94e726796c5 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.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_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index cee3ace0ec3..8dbbb572f29 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -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: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 34d0bbac03b..923c2441987 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.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_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index ef97e48a251..88cf83a3cc3 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -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: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index b674a0cf11d..68e21d26061 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -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: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index 5e3620cba87..f289b9cb514 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -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: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index bd3c0c7d780..a2e54d34770 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -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: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index 1524eb7a77b..dbeec277f88 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -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: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index 75a4ce8fd06..e3e5900fb74 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.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_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index eafe6bd31e1..0669065b7d3 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -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: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index 6a06c0c70b5..dcca0174817 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -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: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index d4aa4b26d99..99cf1edd744 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.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_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index b55d734674f..415b44c6a35 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -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: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index 22a5b9d5c52..ba8b40b3c0a 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -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: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 5edbea4808d..40e131fefdf 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,9 +15,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_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index 5313952606a..bc11ca42c8f 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -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: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index c210f906b9b..8d4a4ecdcbf 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,9 +15,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_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index 29598bb4963..f43ab1e746a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.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_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index cfaad1061df..a52d3ed4a8b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -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: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 521d666742d..4e9f0d1da0e 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -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: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index 29af17f7c08..c9891219f4f 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,9 +15,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_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 917d6fc5cdf..6b8f7176dee 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -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: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 87245438b4d..399dd175311 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,9 +15,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_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index 373267c8921..c06074d4709 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,9 +15,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_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index b67427b9de8..1e3f21d0eb7 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.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_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 8f00ee95200..08450aa204f 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -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: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index edc76a392b0..9b0104ccfe5 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.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_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 302248ae299..0782e089170 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -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: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 9c741080a27..68b6cd9a315 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 4dd0ae15ad4..177be65fb88 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.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_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index ffc0666074d..d573c90eb18 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -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: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index 96f122e59cd..e0b2c2494ad 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -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: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 4beccac04b8..92000240642 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -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: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 484cebf6a2a..6240a2ed5c0 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -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: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index a56201f7dba..e2c4be38a5f 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -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: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 84f6077e5ba..51e133a86dc 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.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_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index 46685416239..aab9c69c1a7 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -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: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index 1d41d1ab59e..dc9732c0719 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -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: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index d6dd854a240..663adaffe60 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -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: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 0b7d6a61f56..73dc6489461 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -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: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index c1ee00edd07..0b42446740b 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.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_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index d694d696801..7d728850185 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -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: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index 925ca9eee81..d062249c3b8 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f67337de388..f33c92ea7fe 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.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_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 8c8454fbc28..92f21a35f28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.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_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index 6c673570cfc..e62275df23d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -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: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 9c05ed97a8d..29ad3853f90 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Oc�bo +-- Copyright (C) 2005 Marc Barilley / Ocbo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -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: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b127b194fa5..b9ba378d81f 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -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: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 5c8ea94ed09..8771b0ddda8 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.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_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 94ba92d4856..8bb011f7280 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.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_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 4017ae32682..1aba5d286d1 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -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: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index 2c77ae3447c..e0c4fd61701 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -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: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 52c0a3e2a03..1e721e86788 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.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_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index 439b2a68098..d4ea3ad5535 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.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_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index f01b7d02e8e..6f8d6a8cf97 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -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: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index bd1e805aed2..854ec6e826e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.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_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index bfc2162ceca..f1e90520593 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.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_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 784e3d37507..15d3bda5ba2 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -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: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 029bc528b6e..66a61851cae 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,9 +15,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_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 9c066c54436..195d2464738 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.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_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index f4e38524d25..44a301a2db7 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -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: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index f03d92ce651..237b5c23030 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.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_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 2c9c2d929db..3bec7551161 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index d9e9ecd43a7..45845593162 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.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_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 01cabfec865..672374961d5 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -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: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index 696cf49c337..d8d9443595d 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -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: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index 170bd56f390..f21fed4d1af 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -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: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index 5a3d71b489a..a501b4db4b6 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -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: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index d29449c2503..41a91a9aa5f 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.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_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index 86f114d395b..e12dbc6fb12 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -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: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index ce320558709..1a83bee6508 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -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: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 76f76ff08ed..93a28593f8e 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -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: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index 133687c7466..ec2bb01863b 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -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: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 6ccd3aa39fb..552a985abd4 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -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: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index e24a8918c5b..63b28ac8410 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -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: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index 26e451271cb..e7ccde53858 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -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: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index 40b07d29305..a1619df5cb5 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -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: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index e21669e63d7..309c60b660f 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.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_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index d094512d975..c92472f7af5 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -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: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index a75fb9aa76d..3fb70995900 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,9 +15,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_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ +-- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index a0d88737e3f..e7fc66a0ed6 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.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_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 9e28a37d6bb..57b252ed2ea 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -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: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index 376447586c9..b8453ea821c 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.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_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index e7528a03f28..00268974476 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -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: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 4f994cf57aa..16bf4dea7f0 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.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_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index 1a7fdfd755f..eff6387abee 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,9 +15,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_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index a618e3d8790..f53599483a4 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -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: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index 902f2b4fd5f..b9643f019c3 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.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_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index 1f5500e2eb1..db4cdd2581c 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -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: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index c7d84e27326..6bf45f749f5 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 523eb3b37e0..7db41de673c 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.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_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index bf057b4ad75..8dc4636c87e 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -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: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index ade6a40a80d..d500fc1b7cb 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.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_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index bca670bbb98..a515ba541bf 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -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: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index 7481589df00..b742b82dafc 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -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: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index 4adaa1a56ff..fff909a0ec8 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -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: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index 16631c76b76..fb65e9b7e84 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -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: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 3df14473a7e..332b1305d38 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.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_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index c3958313ea3..ca4206eb6fc 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -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: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 910d2ab2072..68e1d4f20e9 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -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: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 5c7f2e9a59c..8714e7e4a07 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -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: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index cbaadb10091..7d3b0eecd98 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.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_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index e88665b5a34..8bdd7193d1a 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -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: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ +-- $Id$ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 86916c216a2..367d45e8525 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -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: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 23065b261c8..28b28aeb762 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -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: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ +-- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index 3f58eaf698b..d78db14c30b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -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: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ +-- $Id$ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 18924ff6ac5..68e46fd120d 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.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_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ +-- $Id$ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 8056a150fc3..6acb2db4585 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.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_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 1b5ea5516d4..838f502bfdb 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -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: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index e61985c7dd1..f21099e9c5e 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -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: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index 7bf81b7fbe9..f771be5ef5a 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.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_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 1fb0d708dfa..0033bca36bc 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.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_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ +-- $Id$ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 6df43634ec4..8037c9cd7e5 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -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: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 7b6cbd91645..99234b6660f 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index 810781ed6d9..dca8e80f856 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.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_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index 2e89f083575..f3a58aa1433 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.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_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ +-- $Id$ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index fd656c736ef..98c56c37567 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -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: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ +-- $Id$ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 87f6416c6c5..100d9fe82b0 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -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: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ +-- $Id$ -- ============================================================================ CREATE LANGUAGE plpgsql; diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html new file mode 100644 index 00000000000..38e0f007a15 --- /dev/null +++ b/htdocs/langs/es_ES/html/gpl.html @@ -0,0 +1,330 @@ + + + + + + + + +H. Licencia Pública GNU + + + + + + + + + + + + + +

                              Licencia Pública GNU

                              + + + + +
                              + +GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 + +
                              + +

                              Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, + MA 02139, USA.

                              +

                              Está permitido, a cualquier persona, copiar y distribuir copias tal cual de + este documento de licencia, sin la introducción de cualquier cambio. +

                              + +
                              +

                              Introducción

                              +

                              Las licencias de muchos softwares se desarrollan para asegurar la libertad + de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, + al contrario, pretende garantizar la libertad de compartir y alterar softwares + de libre distribución - volviéndolos de libre distribución también para cualquier + de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares + de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla + (algunos softwares de la FSF son cubiertos por la GNU Library General Public + License).

                              +

                              Cuando nos referimos a softwares de libre distribución, nos referimos a la + libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar + la libertad de distribución de copias de softwares de libre distribución (y + cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos + fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se + hacen algunas restricciones, para asegurar los derechos de los programadores, + prohibiendo a todas las personas su negación o la solicitación de su abdicación. + Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución + o modificación del software.

                              +

                              Por ejemplo, al distribuirse copias de determinado programa, por una tasa + determinada o gratuitamente, se debe informar sobre todos los derechos incidentes + sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia + Pública General GNU.

                              +

                              La protección de los derechos envuelve dos pasos: (1) copyright del software + y (2) licencia que da permiso legal para copia, distribución y/o modificación + del softwares.

                              +

                              Aún para la protección de la FSF y del autor es importante que todos entiendan + que no hay garantías para softwares de libre distribución. Si software se modifica + por alguien y lo pasa adelante, este software no más reflejará el trabajo original + del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                              +

                              Finalmente, cualquier programa de libre distribución está constantemente amenazado + por las patentes de softwares. Buscamos evitar el peligro de que distribuidores + de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. + Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación + de patente se debe hacer permitiendo el uso por cualquier individuo, sin la + necesidad de licencia de uso.

                              +

                              Los términos y condiciones precisas para copia, distribución y modificación + siguen abajo:

                              +
                              +

                              Licencia Pública General GNU

                              +

                              TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN +

                              + +
                                + +

                              1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga + un aviso colocado por el detentor de los derechos de autor diciendo que aquel + podrá ser distribuido en las condiciones de la Licencia Pública General. El + Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado + en un Programa y significa tanto el propio Programa, como cualquier de los + trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, + un trabajo que contenga el Programa o una parte de este, en su forma original + o con modificaciones o traducido para una otra lengua (la traducción está + incluida sin limitaciones en el término ``modificación'').

                                +

                                Actividades distintas de copia, distribución y modificación no están cubiertas + por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa + no está restringido y la salida del Programa está cubierta solamente en + el caso de que su contenido contenga trabajos basados en el Programa (independientemente + de que hayan sido creados por la ejecución del Programa). Si esto es así, + depende de las funciones ejecutadas por el Programa.

                                2. + +

                              2. El código fuente del Programa, de la forma como fue recibido, puede ser + copiado y distribuido, en cualquier media, desde que sea providenciado un + aviso adecuado sobre los copyrights y la negación de garantías, y todos los + avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, + estén inalterados y que cualquier producto oriundo del Programa esté acompañado + de esta Licencia Pública General.

                                +

                                Está permitido el cobro de tasas por el acto físico de transferencia o + grabación de copias, y pueden ser dadas garantías y soporte en cambio del + cobro de valores.

                                3. + + +
                              3. +

                                Se puede modificar la copia o copias del Programa de cualquier forma que + se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir + tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                                + +
                                  +

                                1. Debe existir un aviso destacado de que los datos originales fueron alterados + en los archivos y las fechas de los cambios;

                                  2. + +

                                2. Debe existir un aviso de que el trabajo distribuido o publicado es, + de forma total o parcial, derivado del Programa o de alguna parte suya, + y que puede ser licenciado totalmente sin costes para terceros bajo los + términos de esta Licencia.

                                  3. + +

                                3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, + en el inicio de tu ejecución, presentar la información de copyright y + de ausencia de garantías (o de que la garantía es de responsabilidad de + terceros), y que los usuarios pueden redistribuir el programa bajo estas + condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                                  4. +
                                + + Estos requisitos se aplican a trabajos de modificación en general. Si + algunas secciones identificables no sean derivadas del Programa, y pueden + ser consideradas como partes independientes, entonces esta Licencia y sus + Términos no se aplican a aquellas secciones cuando distribuidas separadamente. + Pero al distribuir aquellas secciones como parte de un trabajo basado en + el Programa, la distribución, como un todo, debe contener los términos de + esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no + a cada una de las partes independientemente de quem los tenga desarrollado. + Más que tener intención de contestar los derechos sobre el trabajo desarrollado + por alguien, esta sección objetiva propiciar la correcta distribución de + trabajos derivados del Programa. + Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado + en él ni a un trabajo basado en él, a un volumen de almacenaje o media de + distribución no obliga la utilización de esta Licencia y de sus términos + al trabajo. +
                                4. + + +
                              4. +

                                Están permitidas, la copia y la distribución, del Programa (o un trabajo + basado en éste) en la forma de código objeto o ejecutable de acuerdo con los + términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                                + +
                                  +

                                1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos + en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada + para manejo de softwares o

                                  +
                                  2. +

                                2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, + de poner a disposición a terceros, por un coste no superior al coste del + medio físico de almacenaje, una copia completa de los códigos fuente en + medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                                  +
                                  3. +

                                3. Esté acompañada con la misma información recibida en relación con la + oferta de la distribución del código fuente correspondiente (esta alternativa + solamente está permitida para distribuciones no comerciales y solamente + si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, + de acuerdo con la sección 2 arriba).

                                  +
                                  4. +
                                + El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones + en aquel trabajo. Cuando se habla en códigos fuentes completos significa + hablar de todos los fuentes de todos los módulos, además de las definiciones + de interfaces asociadas, archivos, scripts utilizados en la compilación + y instalación del ejecutable. Como una excepción excepcional, el código + fuente distribuido podrá no incluir algunos componentes que no se encuentren + en su escopo, como compilador, kernel, etc... para el SO donde el trabajo + sea ejecutado. + Si la distribución del ejecutable o objeto se hace, a través de acceso + a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente + de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos + con los objetos simultáneamente +
                                5. + +
                              5. +

                                No está permitida la copia, modificación, sublicenciamiento o distribución + del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier + tentativa de copia, modificación, sublicenciamiento o distribución del Programa + está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. + Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, + no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas + de esta Licencia.

                                6. +
                              6. +

                                No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá + documento o contrato que garantice permiso de modificación o distribución + del Programa o sus trabajos derivados. Estas acciones están prohibidas por + ley, en el caso de que no se acepten las condiciones de esta Licencia. La + modificación o distribución del Programa, o cualquier trabajo basado en éste, + implica en la aceptación de esta Licencia y de todos los términos de ésta + para copia, distribución o modificación del Programa o trabajos basados en + éste.

                                7. +
                              7. +

                                Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), + el recipiente automáticamente recibe una licencia del detentor original de + los derechos de copia, distribución o modificación del Programa objeto de + estos términos y condiciones. No pueden ser impuestas otras restricciones + en los recipientes.

                                8. + +
                              8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes + o derechos de autor, se impongan restricciones, que contradigan esta Licencia, + estos no exentan de su aplicación. Si no es posible distribuir el Programa + de forma a garantizar simultáneamente las obligaciones de esta Licencia y + otras que sean necesarias, entonces el Programa no podrá ser distribuido. +

                                Si esta Sección se considera, inválida por cualquier motivo particular + o general, su resultado implicará en la invalidación general de esta licencia + en la copia, modificación, sublicenciamiento o distribución del Programa + o trabajos basados en éste.

                                +

                                El propósito de esta sección no es, de forma alguna, incitar a quien quiera + que sea a infringir derechos reclamados en cuestiones válidas y procedentes, + y si proteger las premisas del sistema de libre distribución de software. + Muchas personas tienen hecho contribuciones generosas al sistema, en la + forma de programas, y es necesario garantizar la consistencia y credibilidad + del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución + de los softwares.

                                +

                                Esta sección pretende hacer claro los motivos que crearan las demás cláusulas + de estas Licencia.

                                9. + +
                              9. +

                                Si la distribución del Programa, dentro de los términos de esta Licencia, + tiene restricciones en algún País, por patentes o derechos de autor, el detentor + original de los derechos de autor del Programa bajo esta Licencia puede adicionar + explícitamente limitaciones geográficas de distribución, excluyendo aquellos + Países, haciendo con que la distribución solamente sea posible en los Países + no excluidos.

                                10. + +
                              10. +

                                La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) + puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública + General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos + objetivos y el espirito de la presente versión, pudiendo variar en detalles + referentes a nuevas situaciones encontradas.

                                +

                                A cada versión se da un número distinto. Si el Programa especifica, un + número de versión determinado de esta Licencia, que tenga en su contenido + la expresión ``o versión más actualizada'', es posible optar por las condiciones + de aquella versión o de cualquier versión más actualizada publicada por + la FSF.

                                11. + +
                              11. +

                                Si deseas incorporar parte del Programa en otros programas de libre distribución + de softwares hace falta autorización formal del autor. Para softwares que + la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde + que mantenido el espirito y objetivos originales de esta Licencia.

                                12. +
                              + +

                              AUSENCIA DE GARANTÍAS

                              +
                                +

                              1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER + GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE + EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS + DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, + LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD + Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS + CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y + REPAROS JUZGADOS NECESARIOS.

                                2. +

                              2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR + LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN + RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE + HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS + O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES + O DAÑOS.

                                +

                                FIN DE LA LICENCIA

                              + + +
                              +

                               

                              +

                              Apéndice

                              +

                              ¿Cómo aplicar estos términos a nuevos softwares?

                              +

                              Si has desarrollado un nuevo programa y deseas su amplia distribución para + el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, + que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                              +

                              Para esto basta con anexar este aviso al programa. Se recomienda indicar aún + en el inicio de cada archivo fuente la ausencia de garantías y una anotación + de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                              +

                              <nombre del programa y función> Copyright (C) 199X <Autor> +

                              +

                              Este programa es un software de libre distribución, que puede ser copiado + y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo + con la publicada por la Free Software Foundation, versión 2 de la licencia o + (a criterio del autor) cualquier versión posterior.

                              +

                              Este programa se distribuye en la expectativa de ser útil a sus usuarios, + pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE + ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General + 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. +

                              +

                              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:

                              +

                              Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares + NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software + de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. + Teclea 'muestra condic' para mayores detalles.

                              +

                              Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las + partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos + pueden variar o pueden ser accionados por otras interfaces como clic de ratón, + etc...

                              +

                               

                              +
                              +
                              + +www.conectiva.com + +
                              + + + + + diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt new file mode 100644 index 00000000000..3efbe1ccee7 --- /dev/null +++ b/htdocs/langs/nl_BE/html/gpl.txt @@ -0,0 +1,340 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +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 new file mode 100644 index 00000000000..778e2b02b41 --- /dev/null +++ b/htdocs/langs/nl_NL/html/gpl.txt @@ -0,0 +1,339 @@ +English disclaimer +This is an unofficial translation of the GNU General +Public License into Dutch. It was not published by the Free Software +Foundation, and does not legally state the distribution terms for software +that uses the GNU GPL--only the original English text of the GNU GPL does +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 +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 +richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt +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. + + Voorwoord + +De licenties van de meeste software zijn zo opgesteld om U het recht te +ontnemen om die software te delen en te wijzigen. Hier tegenover staat de +GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen +dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de +software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van +toepassing op het merendeel van de Free Software Foundation's software en van +alle andere programma's waarvan de auteur ze plaatst onder deze licentie. +(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene +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 +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 +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 +software wijzigt. + +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 +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. + +Alsook willen we voor de +bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen +garantie is voor deze vrije software. Als de software gewijzigd is door iemand +anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen +hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen +effect hebben op de reputatie van de oorspronkelijke auteur. + +Ten laatste, elk vrij programma wordt voortdurend bedreigd door software +patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij +programma uiteindelijk een patent verkrijgen op het programma en het daarmee in +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 +hieronder. + + GNU ALGEMENE PUBLIEKE LICENTIE + 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 +van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender +zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar +het Programma of eender welk ander afgeleid werk onder de wet van het +auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan +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, +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 +bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer +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 +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 +van deze licentie, bijgevoegd bij het Programma. + +U mag een honorarium vragen voor de fysische daad van het afleveren van een +kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een +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 +hierboven, indien U ook aan al deze voorwaarden voldoet: + +a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand +gewijzigd hebt en de datum waarop U dat gedaan hebt. + +b) U moet elk werk dat U publiceert of verspreidt en dat volledig of +gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, +als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder +de bepalingen van deze Licentie. + +c) Indien het gewijzigde Programma normaal gezien interactief parameters +inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze +parameters gestart wordt, het een boodschap weergeeft met een gepast +auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat +U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder +deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een +kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf +interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw +werk gebaseerd op dit Programma zulk een boodschap weergeeft. + +Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare +stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs +onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, +niet van toepassing op die delen als U die als aparte werken verspreidt. +Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is +gebaseerd op het Programma, dan moet de verspreiding van het geheel op de +bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere +licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel +van het werk, onafhankelijk van wie het geschreven heeft. + +Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te +wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is +eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de +verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. + +Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het +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 +de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van +de volgende voorwaarden voldoet : + +a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, +verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat +gebruikelijk is voor het uitwisselen van software; of, + +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. + +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 +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 +betekent volledige broncode alle code van alle modules waar het werk uit +bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle +scripts om het programma te compileren en het uitvoerbare bestand te +installeren. Als een speciale uitzondering moet de verspreidde broncode niets +bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de +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. + +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 +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 +hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de +voorwaarden niet schenden. + +5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U +deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het +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 +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, +onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen +beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. + +7. Als door gevolg van een rechterlijke uitspraak of beweringen van +patentenschending of door eender welke andere reden (niet beperkt tot +patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, +overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze +licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te +voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk +de bepalingen van deze licentie als aan andere relevante verplichtingen kan +voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. +Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het +programma zonder het betalen van royalty's vrij verspreid mag worden door zij +die het Programma direct van U verkrijgen en zij die het indirect door U +verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te +voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. + +Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen +worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht +van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel +volledig. + +Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, +of andere aanspraken van bezit, te schenden of de geldigheid van zulke +aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit +te beschermen van het vrije software verspreidingssysteem, dat wordt +toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben +royale bijdragen geleverd aan het systeem van vrije software rekenend op +de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te +bepalen of hij of zij bereidt is om software te verspreiden door middel +van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. + +Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg +te zijn van de rest van deze licentie. + +8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in +bepaalde landen, door patenten of door samenwerking van auteursrechthouders, +dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze +licentie plaatste een expliciete geografische beperking toevoegen zodat +verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. +In dat geval bevat deze licentie de beperking alsof ze in de kern van deze +licentie geschreven was. + +9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de +Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies +zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar +kunnen in details verschillen om nieuwe problemen of aangelegenheden te +behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma +een versie van deze licentie specificeert waarop het van toepassing is en "elke +volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die +licentie te volgen, of van eender welke versie die later uitgegeven werd door de +Free Software Foundation. Als het programma geen versie nummer van de licentie +specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke +versie ooit uitgegeven door de Free Software Foundation. + +10. Indien U delen van het Programma wil invoegen in andere vrije Programma's +dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat +programma om toestemming vragen. Voor software waarvan het auteursrecht bij +de Free Software Foundation rust, schrijf naar de Free Software Foundation; we +maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze +twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te +vrijwaren en om het delen en hergebruiken van software in het algemeen te +promoten. + +11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN +GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. +UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE +AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, +EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, +DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD +DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET +PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE +KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. + +12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK +OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET +PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, +VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, +SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT +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 +OVER DE MOGELIJKHEID TOT ZULKE SCHADE. + +EINDE VAN DE BEPALINGEN EN VOORWAARDEN + +Hoe deze bepalingen op uw nieuwe Programma's toepassen. + +Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk +nut is voor iedereen, dan is de beste manier om dit te bereiken door het +Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen +onder deze bepalingen. +Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het +veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het +ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de +"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden +kan worden moeten bevatten. + + +Auteursrecht (C) +Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de +bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free +Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een +latere versie. +Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar +ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van +VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene +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. + +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 +deze wanneer het in interactieve modus start: + +Fiscus versie 69, Auteursrecht (C) +Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is +vrije software en het is U toegestaan deze te verspreiden onder +bepaalde voorwaarden;typ 'toon c' voor meer details. + +U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die +er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, +indien nodig. Hier is een voorbeeld; wijzig de namen: + +Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma +Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. +, 21 April 1984 Ty Coon, Vice voorzitter. + +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, +dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van +deze licentie. \ No newline at end of file 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/ajax.lib.php b/htdocs/lib/ajax.lib.php index 7db1908bc49..55def736688 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ */ diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 49b67f9349a..1bdeb9562e6 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index eedd6a8841c..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/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index d6bf7267439..454073d9730 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 6e1e7b262f4..b5304ba4198 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index b0a7c2dece6..bda35165079 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.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/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ + * \version $Id$ */ if (session_id() == "") session_start(); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1da2adb751e..8bccf934120 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index a65f888ab11..efbd289cb3f 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ */ require("../main.inc.php"); @@ -1646,6 +1645,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); +llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 79601ea1031..8f373b577e8 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 8cf57ec0b64..724900dc500 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ + * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ */ require("../main.inc.php"); @@ -272,5 +271,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); +llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); ?> diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 78ca25e85a6..edb62d728d5 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $ + * \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index e78dff8f646..f93935ffb16 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.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/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ + * \version $Id$ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal 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 $'); ?> From cc3937a63b63bdaf79469269a9617bab06152f74 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Aug 2011 12:08:31 +0000 Subject: [PATCH 117/118] Fix: case problem --- build/deb/control.DEBIAN | 46 ---------------------------------------- 1 file changed, 46 deletions(-) delete mode 100755 build/deb/control.DEBIAN diff --git a/build/deb/control.DEBIAN b/build/deb/control.DEBIAN deleted file mode 100755 index 7c66775bdf1..00000000000 --- a/build/deb/control.DEBIAN +++ /dev/null @@ -1,46 +0,0 @@ -Package: dolibarr -Version: __VERSION__ -Architecture: all -Maintainer: Laurent Destailleur -Installed-Size: 61200 -Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl -Section: web -Priority: optional -Homepage: http://www.dolibarr.org -Description: Easy to use web based ERP & CRM software - Dolibarr ERP & CRM is an easy to use open source/free software for small - and medium companies, foundations or freelances. It includes different - features for Enterprise Resource Planning (ERP) and Customer Relationship - Management (CRM) but also for different other activities. - It's a web software you can install as a standalone program or on any web - hosting provider to use it from anywhere with any web browser. - Dolibarr was designed to provide only features you need and be easy to use. - . - Only features you need are visible, depending on which module were activated. - Most common used modules are: - . - Customers, Suppliers or Prospects directory, - Contacts directory, - Orders management, - Commercial proposals management, - Invoices management, - Products and services catalog, - Stock management, - Foundations members management, - Bank accounts management, - Point of Sale, - Payments management, - Commercial actions management, - Contracts management, - Standing orders management, - Shipping management, - Donations management, - Bookmarks management, - Mass Emailings, - Reports, - Wizards to export and import data, - LDAP connectivity, - PDF exports, - And a lot of more modules... - . - You can also add third parties external modules or develop yours. From 42384e94f293568438819efd93f839fb8b6f3781 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Jul 2011 21:04:27 +0000 Subject: [PATCH 118/118] Fix: jnotify was not visible --- build/deb/README | 5 +- build/deb/changelog | 2 +- build/deb/control.debian | 10 +- build/deb/dolibarr.desktop | 4 + build/deb/install | 1 + build/deb/po/fr.po | 22 +- build/deb/po/templates.pot | 20 +- build/deb/postinst | 100 +- build/deb/postrm | 119 +- build/deb/templates | 7 + build/makepack-dolibarr.pl | 204 +--- dev/skeletons/modMyModule.class.php | 4 +- htdocs/admin/boxes.php | 8 +- htdocs/admin/modules.php | 35 +- htdocs/admin/perms.php | 34 +- htdocs/admin/proxy.php | 7 +- htdocs/admin/security_other.php | 7 +- htdocs/boxes.php | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/validation_verif.php | 3 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/index.php | 7 +- htdocs/compta/paiement.php | 7 +- htdocs/compta/prelevement/create.php | 7 +- htdocs/contrat/fiche.php | 6 +- htdocs/core/class/conf.class.php | 6 +- htdocs/core/class/cookie.class.php | 5 +- htdocs/core/class/translate.class.php | 7 +- htdocs/filefunc.inc.php | 7 +- htdocs/imports/import.php | 7 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 ++++++++--------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/index.php | 7 +- htdocs/install/check.php | 5 +- htdocs/install/default.css | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 32 +- .../mysql/data/llx_20_c_departements.sql | 3 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_availability.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/langs/es_ES/html/gpl.html | 330 ------ htdocs/langs/nl_BE/html/gpl.txt | 340 ------ htdocs/langs/nl_NL/html/gpl.txt | 339 ------ htdocs/lib/admin.lib.php | 77 +- htdocs/lib/ajax.lib.php | 5 +- htdocs/main.inc.php | 5 +- htdocs/master.inc.php | 6 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- htdocs/theme/auguria/style.css.php | 5 +- .../smartphone/theme/default/default.css.php | 5 +- htdocs/user/group/perms.php | 34 +- htdocs/user/perms.php | 32 +- 339 files changed, 1618 insertions(+), 2772 deletions(-) delete mode 100644 htdocs/langs/es_ES/html/gpl.html delete mode 100644 htdocs/langs/nl_BE/html/gpl.txt delete mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/README b/build/deb/README index edb46ffd5a3..d73d7a99219 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build package +# dpkg -b To build binary only package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# +# dpkg-reconfigure -plow package Reconfigure package # dpkg -L packagename List content of installed package +# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package diff --git a/build/deb/changelog b/build/deb/changelog index b035f18ae1d..3382966714b 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 + -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/control.debian b/build/deb/control.debian index 91f0705c001..e28258d8dbc 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,10 +4,16 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper, po-debconf +Build-Depends: debhelper (>= 7), po-debconf Package: dolibarr -Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, + php5-mysql | php5-mysqli, + php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, + ${misc:Depends}, xdg-utils, + mysql-server, perl +Recommends: apache2 | lighttpd | httpd, mysql-client +Suggests: www-browser Architecture: all Section: web Priority: optional diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index a48e5048dff..f4b471edf13 100644 --- a/build/deb/dolibarr.desktop +++ b/build/deb/dolibarr.desktop @@ -3,10 +3,14 @@ # It must be saved into directory /usr/share/applications Version=1.0 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM +Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations +Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/deb/install b/build/deb/install index 4d41fd52c65..2928d378abc 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,4 +1,5 @@ etc/dolibarr/apache.conf +etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po index 13b8030ed0d..3bbe762283a 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:49+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,10 +25,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "Seveur web à reconfigurer automatiquement:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" +"Selectionnez le serveur web à configurer automatiquement pour utiliser " +"dolibarr." + # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -36,7 +52,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index 32c92a97cc4..d65e5d8b7f6 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:52+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,15 +17,29 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: multiselect #. Description #: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:2001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index ca5fd1645dd..e0bba1be4da 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,7 +1,5 @@ #!/bin/sh # postinst script for dolibarr -# -# see: dh_installdeb(1) set -e @@ -16,6 +14,31 @@ set -e # for details, see /usr/share/doc/packaging-manual/ + + +lighttpd_install() { + if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + if which lighty-enable-mod >/dev/null 2>&1 ; then + echo "Add link for Lighttpd config file" + ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf + # We enabled it + lighty-enable-mod dolibarr fastcgi-php + else + echo "Lighttpd not installed, skipping" + fi + fi +} + +apache_install() { + webserver=$1 + if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Add link for Apache config file" + ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + . /usr/share/debconf/confmodule db_version 2.0 @@ -27,8 +50,6 @@ 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" @@ -44,10 +65,6 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir - # Copy apache.conf file into target directory - #mkdir -p /etc/dolibarr - #cp -p $apachefileorig $apacheconfig - # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -74,21 +91,15 @@ case "$1" in chmod -R 660 $config fi - # Get the web server type (use db_get for interactive mode). - #db_reset "dolibarr/webserver" - #db_get "dolibarr/webserver" # Read value for webserver. - #webserver="$RET" - - case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; - esac - + + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + # Set up web server. - for server in $webservers ; do - echo Complete config of server $server + for webserver in $webservers ; do + webserver=${webserver%,} + echo Complete config of server $webserver # Detect webuser and webgroup webuser= @@ -106,26 +117,31 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config - - # Add link to config file - echo Setup web server $server to add dolibarr config file - ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf - done - # Restart servers - servers="apache2-ssl apache2 mysql" - # Another way to restart - for server in $servers ; do - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $server reload || true - else - echo Restart web server $server using $server reload - /etc/init.d/$server reload || true - fi + # Restart web server. + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_install + else + apache_install $webserver + fi + # Reload webserver in any case, configuration might have changed + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $webserver reload 3>/dev/null || true + else + echo Restart web server $server using $server reload + /etc/init.d/$webserver reload 3>/dev/null || true + fi + fi done + echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -136,13 +152,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument $1" >&2 exit 0 ;; esac -db_stop - #DEBHELPER# +db_stop + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 9eae81b022b..27ce3777b7e 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,7 +17,36 @@ set -e # for details, see /usr/share/doc/packaging-manual/ -. /usr/share/debconf/confmodule + +lighttpd_remove() { + if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then + echo "Remove link for Lighttpd config file" + rm -f /etc/lighttpd/conf-available/50-dolibarr.conf + if which lighty-enable-mod >/dev/null 2>&1 ; then + lighty-disable-mod dolibarr + else + echo "Lighttpd not installed, skipping" + fi + # See bug #448682 + if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then + echo 'Manually deleting lighttpd/dolibarr configuration link' + rm /etc/lighttpd/conf-enabled/50-dolibarr.conf + fi + fi +} + +apache_remove() { + if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then + echo "Remove link for Apache config file" + rm -f /etc/$webserver/conf.d/dolibarr.conf + fi +} + + + +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi db_version 2.0 @@ -26,63 +55,62 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' -apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" -apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" -export webserver="" -# Allows us to loop and substitute in one pass -case $webserver in - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; -esac - case "$1" in # Call when we upgrade upgrade) + echo "postrm upgrade" ;; # Call when we uninstall remove) + echo "postrm remove" rm -f $lockfile - # 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" + # Reconfigure web server + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + + # Restart web servers + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_remove + else + apache_remove $webserver + fi + # Redirection of 3 is needed because Debconf uses it and it might + # be inherited by webserver. See bug #446324. + if [ -f /etc/init.d/$webserver ] ; then + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload 3>/dev/null || true + else + /etc/init.d/$webserver reload 3>/dev/null || true + fi fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" + echo "postrm purge" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical "dolibarr/postrm" || true + db_input critical dolibarr/postrm || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get "dolibarr/postrm" + db_get dolibarr/postrm set -e if [ "$RET" = "true" ] ; then @@ -185,41 +213,12 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi - # Remove include files - export restart="" - for server in $webservers ; do - export conffile="/etc/$server/conf.d/dolibarr.conf" - if [ -f $conffile ] ; - then - echo Delete file $conffile - rm -f $conffile - status=purge - fi - - if [ "x$status" = "xpurge" ] ; - then restart="$restart $server" - fi - done - rm -rf /etc/dolibarr - # Restart servers - for server in $restart ; do - # We disable blocking errors - set +e - echo "Restart server $server if exists" - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $server reload || true - else - /etc/init.d/$server reload || true - fi - # We restore blocking errors - set -e - done - # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset "dolibarr/postrm" + db_reset dolibarr/reconfigure-webserver + db_reset dolibarr/postrm set -e #db_purge @@ -229,7 +228,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "postrm called with unknown argument $1" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index 5c06afd8ccd..b96325a4e64 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,3 +1,10 @@ +Template: dolibarr/reconfigure-webserver +Type: multiselect +Choices: apache2, lighttpd +_Description: Web server to reconfigure automatically: + Please choose the web server that should be automatically configured + to run dolibarr. + Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index d3c47e6b28d..f191d88c7f9 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.128 2011/07/31 22:08:13 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.121 2011/07/28 23:05:13 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -11,7 +11,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="1"; -$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="auto"; # auto use value found into BUILD @LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.121 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -254,18 +254,15 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliW*-*`; $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliM*-*`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.changes`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`; $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`; @@ -276,10 +273,6 @@ 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`; @@ -298,6 +291,11 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`; $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; $ret=`rm -fr $BUILDROOT/$PROJECT/document`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`; @@ -308,7 +306,6 @@ 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`; @@ -416,19 +413,14 @@ if ($nboftargetok) { } if ($target eq 'RPM') { # Linux only - #$ARCH='i386'; - $ARCH='noarch'; + $ARCH='i386'; if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; } $newbuild = $BUILD; - # For fedora - $newbuild =~ s/(dev|alpha)/0.1.a/gi; # dev - $newbuild =~ s/beta/0.2.beta1/gi; # beta - $newbuild =~ s/rc./0.3.rc1/gi; # rc + $newbuild =~ s/(dev|alpha)/0/gi; # dev + $newbuild =~ s/beta/1/gi; # beta + $newbuild =~ s/rc./2/gi; # rc if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale - #$newbuild =~ s/(dev|alpha)/0/gi; # dev - #$newbuild =~ s/beta/1/gi; # beta - #$newbuild =~ s/rc./2/gi; # rc - #if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale + # now newbuild is 0-0 or 0-3 for example $REL1 = $newbuild; $REL1 =~ s/-.*$//gi; if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; } print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; @@ -446,93 +438,16 @@ 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 -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$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`; @@ -560,10 +475,6 @@ 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; } @@ -614,33 +525,20 @@ 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`; @@ -700,7 +598,17 @@ if ($nboftargetok) { print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`; - # Set owners + #print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n"; + #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`; + + # copyright (to build binary package directly without sources. Useless if we build from sources) + #print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n"; + #$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`; + + # changelog (to build binary package directly without sources. Useless if we build from sources) + #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`; + #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`; + print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`; @@ -744,25 +652,29 @@ 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=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`; + $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"`; # 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`; @@ -778,18 +690,12 @@ if ($nboftargetok) { if ($OS =~ /windows/i) { print "Move *_all.deb to $DESTI\n"; - $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; - $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; - $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; - $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; + $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; } else { print "Move *_all.deb to $DESTI\n"; - $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; - $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; - $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; - $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; + $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; } next; } diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 3cc548e1c0a..d7172d651f0 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -27,7 +27,7 @@ * \file htdocs/includes/modules/modMyModule.class.php * \ingroup mymodule * \brief Description and activation file for module MyModule - * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $ + * \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); @@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='generic'; - // Defined if the directory /mymodule/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 718c842d046..34e7f48cea8 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -20,7 +20,7 @@ /** * \file htdocs/admin/boxes.php * \brief Page to setup boxes - * \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $ */ require("../main.inc.php"); @@ -278,7 +278,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -394,7 +394,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -470,5 +470,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $'); +llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $'); ?> diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index a907f47663a..671bd69a0e4 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2010 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ /** * \file htdocs/admin/modules.php * \brief Page to activate/disable all modules - * \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $ */ require("../main.inc.php"); @@ -79,12 +79,35 @@ $modules = array(); $orders = array(); $categ = array(); $dirmod = array(); +$modulesdir = array(); $i = 0; // is a sequencer of modules found $j = 0; // j is module number. Automatically affected if module number not defined. -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $althandle=@opendir($dirroot); + if (is_resource($althandle)) + { + while (($file = readdir($althandle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                              "; dol_syslog("Scan directory ".$dir." for modules"); @@ -449,5 +472,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $'); +llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $'); ?> diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index bee00b52906..6af9b54e7f0 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -21,7 +21,7 @@ * \file htdocs/admin/perms.php * \ingroup core * \brief Page d'administration/configuration des permissions par defaut - * \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $ + * \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $ */ require("../main.inc.php"); @@ -76,10 +76,34 @@ $db->begin(); // Charge les modules soumis a permissions $modules = array(); -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +$modulesdir = array(); +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                              "; $handle=@opendir($dir); @@ -194,5 +218,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $'); +llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $'); ?> diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 2c284c5cae8..f02e3d6203a 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ + * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -205,5 +206,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c1d629f7b7b..c0aaaa86213 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -347,5 +348,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/boxes.php b/htdocs/boxes.php index 2affdf654d3..d426e618377 100644 --- a/htdocs/boxes.php +++ b/htdocs/boxes.php @@ -22,7 +22,7 @@ * \brief File of class to manage widget boxes * \author Rodolphe Qiedeville * \author Laurent Destailleur - * \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $ */ @@ -220,7 +220,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php"); + $sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); } else { @@ -281,7 +281,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index c79d46fbeb5..698cceb4966 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,11 +11,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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ -/* \version $Id$ */ +/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index f91946e11c0..2d89cfd2388 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.js @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ // Instanciation et initialisation de l'objet xmlhttprequest diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index 1afc2d54b02..0d679c15b84 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -14,7 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ require('../main.inc.php'); diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 259dc4dbce5..96de90124f9 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -48,7 +47,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -67,7 +66,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -78,17 +77,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 0c262ba2936..5ba2ef8997e 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -385,5 +386,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 525160df9ef..9ee1f551048 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ + * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -607,5 +608,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index e05eaa66ecf..0efb704828f 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ + * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -1032,5 +1031,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); ?> diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index d2f2a7aae7e..5da397b4183 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ + * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ */ require('../main.inc.php'); @@ -673,5 +672,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); +llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); ?> diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 79d00ae00c7..689e2639773 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ + * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -275,5 +276,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); +llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 0cf91d64abc..b0145e14628 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -23,7 +23,7 @@ * \file htdocs/contrat/fiche.php * \ingroup contrat * \brief Page of a contract - * \version $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $ + * \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $ */ require ("../main.inc.php"); @@ -757,7 +757,7 @@ else $var=!$var; - if ($action != 'editline' || $_GET["rowid"] != $objp->rowid) + if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid) { print ''; // Libelle @@ -1286,5 +1286,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $'); +llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index acb0b5d9167..c5664164e74 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -24,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.63 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ */ @@ -144,13 +144,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard + $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard + $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/'; } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php index c21450bb8cb..07fed567b48 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,13 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index bf30794f153..4496c18ff1f 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -23,7 +23,7 @@ * \brief File for Tanslate class * \author Eric Seigne * \author Laurent Destailleur - * \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $ + * \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $ */ @@ -512,9 +512,10 @@ class Translate { * Return list of all available languages * @param langdir Directory to scan * @param maxlength Max length for each value in combo box (will be truncated) + * @param usecode Show code instead of country name for language variant * @return array List of languages */ - function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0) + function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0) { global $conf; @@ -527,7 +528,7 @@ class Translate { { $this->load("languages"); - if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE) + if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE)) { $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength); } diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 3148174f5af..13a97bf54b3 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,14 +20,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -64,7 +65,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 97d4d8252d3..c03b55d2347 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ + * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ */ require_once("../main.inc.php"); @@ -1668,7 +1669,7 @@ print '
                              '; $db->close(); -llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); +llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); /* diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 257b95e4e3c..6f6c7ed2a1b 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -65,7 +64,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.30 $'); + $ver=explode(' ','$Revision: 1.31 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 127eb16e389..446606ef055 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -64,7 +63,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
                              This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.27 $'); + $ver=explode(' ','$Revision: 1.28 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 9c90d1fcc94..46fa4c9ccc4 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,9 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* or see http://www.gnu.org/ +* along with this program. If not, see . */ /** @@ -22,7 +20,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id$ + * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -61,7 +59,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
                              This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision$'); + $ver=explode(' ','$Revision: 1.14 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index ec7e1af07c6..7055bef4b69 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php index 42780551928..c7bab37ad4b 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.10 2011/07/31 23:28:10 eldy Exp $ + * \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis 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/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 1; // Data directories to create when module is enabled diff --git a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index b1e3f5a2638..067e831b0b4 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,504 +1,503 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; If not, see . + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index b1e3f5a2638..e5f0ff4c0e5 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + License along with this library; If not, see . Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/index.php b/htdocs/index.php index f027e94a35a..5998094d362 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -573,7 +574,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); +llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9b19d9793fc..3724ef23d95 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 9978c8f437a..1d2084e7c7f 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: default.css,v 1.24 2011/08/03 01:32:42 eldy Exp $ */ body { diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 737e16cc10c..20ef1080e85 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ + * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index c9713870c22..5d7fca530f2 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index e7b45a476f1..d7df4ac6929 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 62e0a4a90cf..9a0dd0fcc43 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ + * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 50fa9904890..0037190af06 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 2e0fccb0051..6d19b01e197 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ + * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 223a2eb6d92..3050d37833c 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -74,12 +75,10 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -$lockfile = '../../install.lock'; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; -#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here -$lockfile = '../../install.lock'; + if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -179,7 +178,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists($lockfile)) +if (file_exists('../../install.lock')) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
                              '; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index 841136fff8b..c786f91346c 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ + * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 9d08a56e41c..275298588e2 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 1f046a29bc4..1c43326d70f 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $ -- -- @@ -158,21 +158,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1); -- Regions Chile (id country=67) -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1); -- Regions San Salvador (id country=86) INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1); diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 9a109ab3fdc..e3963e8e68f 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $ -- -- @@ -566,6 +566,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1); +INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1); diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index 56ceea3d807..da244f79951 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index 3a248c2f49f..eee5dfa185a 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index dcbaf2faaf4..e3922b97f65 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index 1dd3cb59a62..b7f6c71c87e 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,10 +11,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index 5e93e39d048..f3299990858 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index e3ed8196d17..1f14cc8c142 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 176e5c796e2..5017ce0c60d 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index db630463dbf..f58db2b32a6 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index c67d263853d..079caa7dde4 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 07fa2abaa83..4bb81528e74 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index e29b3f306f5..720413ac480 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index c7fa6b6dd1f..cb0b557b438 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index 6a597996424..a3a19cc2125 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 78e174b9817..1ec498e6bc2 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a535a5098e..3a17978bb0c 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index f6395abbfcd..96d456312df 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 9c28f697f83..488b0a564eb 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index 988d9c26136..d8701c52c01 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ -- -- @@ -34,4 +33,4 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2d1a3c62a39..2fd47385a90 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index 4238000eb14..da98640fd25 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 6e596be24e5..789ad16fce2 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index e2faed3cba3..48b77951e1f 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index cf7e9e96275..59bd3d1ef00 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index 655848a50ae..cd2f27a5dca 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 968a131e2bb..42f86f1c447 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 6e6e960072b..685170362fd 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 02ff06ba9f1..921bc569980 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index f22262c9353..d5902b539c7 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index b2cdf08af5f..ddd3d734ff7 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 031bfb614e1..8c5c23bbe62 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index 3aa9555979e..f7b876eed86 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 4703aa32ddd..8d34e2a9c78 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index 69bf706ca68..ad6f448e3dc 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 9156b439833..51d66c04584 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index db64e0cbf9c..7df7f21a3b9 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index a7efcbd0f6d..31676d7d6e2 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index 7e4fa074e71..bc9d9ad0936 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index d23a1367f92..18eed730ab8 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index 2b2db5af657..ade41da746e 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index b5c9175202b..62a88236480 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 6ed1e00dd88..015a9e9b4c0 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index d1279c21eb2..296b49fc93f 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 822a69bc4ec..9cedf70e7ca 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index aba765190ee..55718d8ffb5 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index eded16c49fe..abc9baa2d8c 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index e39fbf71f12..3dd83585bcd 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 3710a87470a..217edcaddbb 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================= -- courant : type de compte: 0 epargne, 1 courant, 2 caisse diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index ad41449f288..5869f24d8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index f6301a24919..5db17f19069 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index cd68a9cdb40..5f66ff625f0 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index 890c7597862..b0546729ef0 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index d67cf7fe4b8..4794113f8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5c06c73c69d..5fc25f57339 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 115bd310d70..5746cce26aa 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index d3c71cc4a70..ba1e56e2b94 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index 10c4cc2d853..de9c23e9c05 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,11 +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, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- --- $Id$ +-- $Id: llx_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index 09365976d78..cce9d04707b 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 463b1235094..93e8e3d99a7 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index c81a2b3e830..b0f31fe7116 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index 821fe3e5c04..cb2251cfaf6 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 9380607010d..8bebcf13116 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index e524d9c937a..b30354cae19 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index 0b0b34390c4..b026a40d762 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 7b5fa661d7d..39d21cee7b9 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index e2f225fe608..d1e6b216b4b 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 66cd5111325..60af7723f30 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index ebca12ab5da..cb223ae5532 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_chargesociales diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 3872bedd39d..415b8526793 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_c_civilite diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index bed4ad41dfc..5c54695f608 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 23cd0f575ed..93ef5d59770 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index f46d2a56c33..7702a8cf21e 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 4669de108f4..46a35567e95 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index a6bb8ca70f7..c2c43a3a625 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 5637e5a987d..547500d7f33 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_effectif diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index 884d8274cfd..bf7ed18af80 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index 2b6dea6cbd3..d0dceaf0fe1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 76aecebbb9a..192183be0c1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== create table llx_c_forme_juridique diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index 665a210d74b..d6d673962b9 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index 7fcd57e31eb..c8deefef6d7 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_input_method diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index e1cab3b3368..757653f1fc2 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f97e458be6b..f2fb7fda4d3 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ======================================================================== create table llx_c_input_reason diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 165a8550331..7a228ec1572 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 6efa388ef81..120e27ae77d 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index c8824b2d04e..a5e3fd8721b 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 311183c87f4..418e37a85b1 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 2d00f620e02..1cc5dbfaf0e 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 02052920c8a..84c72e0839b 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 0f608cbc171..8cf0ec900f8 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 75b40946559..2eed307bc54 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index 76caf44356d..c977dd9dd21 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 861671e3607..8307ca88eb6 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 46504e8a1c4..9a7bda88c28 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index dc284fc8cea..725ddbfeb90 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index 4f8736a3a14..a1feeb33f8b 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -13,8 +13,7 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -24,7 +23,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 85ea592d950..1e141b7768a 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 9fad6cc333e..79d54faf623 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index d6bd27758b4..97638937c74 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 40759cdc50b..211af70a854 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 80e73c43399..7c4c534451d 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index 4c466e0c02b..f2330322a5f 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 46a39b3c9e7..8e4492c28a9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 60641bf1876..39be52cf374 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index cfe126b5adf..e93ce9b4354 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index 7e12e06beb7..baa01289b96 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index 83eb804c875..bd19d25f1a5 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index 6236e113766..eb95b9fe66c 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index cf5121c34f9..2c95fde3255 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index cabdcce3a80..d62011351c4 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index ebaf9582414..a07ff049d61 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index fa9a85aac1f..730bc11ac98 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index ec8931763bf..6f129f2feec 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 7958b56f354..172a2432ee1 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ --- Supprimme orphelins pour permettre monte de la cl +-- Supprimme orphelins pour permettre mont�e de la cl� -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index 3f848c9ffe2..c13c0aa6019 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index df6d49827f6..f0c65456e5c 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index 9bb45f9d326..be4e60a9a97 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 91914ab66c7..23cfd068495 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b39863cab..d1b18165255 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index e964fbc2f5e..19ec675f973 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a747c714fb3..a53a24d9a66 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 16ecb365d6c..46639ca7c1e 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index bfce896eb19..d1ba0645e05 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index 51234007ee1..b7fc52403af 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index eead2907fa2..4187f526393 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 1c757fa6c86..7b74d8b506d 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -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 . -- --- $Id$ +-- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ --- Supprimme orhpelins pour permettre monte de la cl +-- Supprimme orhpelins pour permettre mont�e de la cl� -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index 79b52ba399c..f1f4a75b604 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 3757e4522bf..39b89773316 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index f5987250001..98b29b1f715 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 9c4a5e340ab..0eb566317d0 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 906d0a3e2f4..3fb9f7d6d2d 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index 20bb329ff0e..ba595100b5f 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index 2063a310fb8..b71d2697b85 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index a99b42859c7..61d63046fac 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index f0e0a065089..0e20201f4cb 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 06af8a78575..154f0b51006 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1c5d5c30173..1dc4941012a 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index e43f4cb118c..a208aa5fff0 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index e4eb41f3bb4..f60029ee290 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 463675b10b7..2833920b746 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index fc998bd6edb..7987ca819c1 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index 1e9b0495d34..e027d471e23 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ +-- $Id: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index b899c4303e1..8b279dc578b 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 5d6d86617e6..684c5aa5a7c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index 6de1b23eb64..cdccf3eb6ec 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index 04491e0878c..fee45753759 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 575930a728c..9401f679071 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 46b769b8afc..757e8d2b447 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index e1b82141ea1..d0118ebdc6c 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 19824c860de..57d92bc8ce9 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 455916a3010..6f2ddcf56b9 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 94e726796c5..6cf13137710 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index 8dbbb572f29..cee3ace0ec3 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 923c2441987..34d0bbac03b 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index 88cf83a3cc3..ef97e48a251 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index 68e21d26061..b674a0cf11d 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index f289b9cb514..5e3620cba87 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index a2e54d34770..bd3c0c7d780 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index dbeec277f88..1524eb7a77b 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index e3e5900fb74..75a4ce8fd06 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index 0669065b7d3..eafe6bd31e1 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index dcca0174817..6a06c0c70b5 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index 99cf1edd744..d4aa4b26d99 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index 415b44c6a35..b55d734674f 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index ba8b40b3c0a..22a5b9d5c52 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 40e131fefdf..5edbea4808d 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index bc11ca42c8f..5313952606a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index 8d4a4ecdcbf..c210f906b9b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index f43ab1e746a..29598bb4963 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index a52d3ed4a8b..cfaad1061df 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 4e9f0d1da0e..521d666742d 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index c9891219f4f..29af17f7c08 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 6b8f7176dee..917d6fc5cdf 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 399dd175311..87245438b4d 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index c06074d4709..373267c8921 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index 1e3f21d0eb7..b67427b9de8 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 08450aa204f..8f00ee95200 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index 9b0104ccfe5..edc76a392b0 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 0782e089170..302248ae299 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 68b6cd9a315..9c741080a27 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 177be65fb88..4dd0ae15ad4 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index d573c90eb18..ffc0666074d 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index e0b2c2494ad..96f122e59cd 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 92000240642..4beccac04b8 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 6240a2ed5c0..484cebf6a2a 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index e2c4be38a5f..a56201f7dba 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 51e133a86dc..84f6077e5ba 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index aab9c69c1a7..46685416239 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index dc9732c0719..1d41d1ab59e 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index 663adaffe60..d6dd854a240 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 73dc6489461..0b7d6a61f56 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index 0b42446740b..c1ee00edd07 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index 7d728850185..d694d696801 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index d062249c3b8..925ca9eee81 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f33c92ea7fe..f67337de388 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 92f21a35f28..8c8454fbc28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index e62275df23d..6c673570cfc 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 29ad3853f90..9c05ed97a8d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Ocbo +-- Copyright (C) 2005 Marc Barilley / Oc�bo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b9ba378d81f..b127b194fa5 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 8771b0ddda8..5c8ea94ed09 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 8bb011f7280..94ba92d4856 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 1aba5d286d1..4017ae32682 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index e0c4fd61701..2c77ae3447c 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 1e721e86788..52c0a3e2a03 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index d4ea3ad5535..439b2a68098 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index 6f8d6a8cf97..f01b7d02e8e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index 854ec6e826e..bd1e805aed2 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index f1e90520593..bfc2162ceca 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 15d3bda5ba2..784e3d37507 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 66a61851cae..029bc528b6e 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 195d2464738..9c066c54436 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index 44a301a2db7..f4e38524d25 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index 237b5c23030..f03d92ce651 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 3bec7551161..2c9c2d929db 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index 45845593162..d9e9ecd43a7 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 672374961d5..01cabfec865 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index d8d9443595d..696cf49c337 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index f21fed4d1af..170bd56f390 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index a501b4db4b6..5a3d71b489a 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index 41a91a9aa5f..d29449c2503 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index e12dbc6fb12..86f114d395b 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index 1a83bee6508..ce320558709 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 93a28593f8e..76f76ff08ed 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index ec2bb01863b..133687c7466 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 552a985abd4..6ccd3aa39fb 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index 63b28ac8410..e24a8918c5b 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index e7ccde53858..26e451271cb 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index a1619df5cb5..40b07d29305 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index 309c60b660f..e21669e63d7 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index c92472f7af5..d094512d975 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index 3fb70995900..a75fb9aa76d 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ +-- $Id: llx_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index e7fc66a0ed6..a0d88737e3f 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 57b252ed2ea..9e28a37d6bb 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index b8453ea821c..376447586c9 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index 00268974476..e7528a03f28 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 16bf4dea7f0..4f994cf57aa 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index eff6387abee..1a7fdfd755f 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index f53599483a4..a618e3d8790 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index b9643f019c3..902f2b4fd5f 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index db4cdd2581c..1f5500e2eb1 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index 6bf45f749f5..c7d84e27326 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 7db41de673c..523eb3b37e0 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index 8dc4636c87e..bf057b4ad75 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index d500fc1b7cb..ade6a40a80d 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index a515ba541bf..bca670bbb98 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index b742b82dafc..7481589df00 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index fff909a0ec8..4adaa1a56ff 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index fb65e9b7e84..16631c76b76 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 332b1305d38..3df14473a7e 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index ca4206eb6fc..c3958313ea3 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 68e1d4f20e9..910d2ab2072 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 8714e7e4a07..5c7f2e9a59c 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index 7d3b0eecd98..cbaadb10091 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index 8bdd7193d1a..e88665b5a34 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 367d45e8525..86916c216a2 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 28b28aeb762..23065b261c8 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ +-- $Id: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index d78db14c30b..3f58eaf698b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 68e46fd120d..18924ff6ac5 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 6acb2db4585..8056a150fc3 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 838f502bfdb..1b5ea5516d4 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index f21099e9c5e..e61985c7dd1 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index f771be5ef5a..7bf81b7fbe9 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 0033bca36bc..1fb0d708dfa 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 8037c9cd7e5..6df43634ec4 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 99234b6660f..7b6cbd91645 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index dca8e80f856..810781ed6d9 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index f3a58aa1433..2e89f083575 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index 98c56c37567..fd656c736ef 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 100d9fe82b0..87f6416c6c5 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ -- ============================================================================ CREATE LANGUAGE plpgsql; diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html deleted file mode 100644 index 38e0f007a15..00000000000 --- a/htdocs/langs/es_ES/html/gpl.html +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - -H. Licencia Pública GNU - - - - - - - - - - - - - -

                              Licencia Pública GNU

                              - - - - -
                              - -GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 - -
                              - -

                              Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, - MA 02139, USA.

                              -

                              Está permitido, a cualquier persona, copiar y distribuir copias tal cual de - este documento de licencia, sin la introducción de cualquier cambio. -

                              - -
                              -

                              Introducción

                              -

                              Las licencias de muchos softwares se desarrollan para asegurar la libertad - de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, - al contrario, pretende garantizar la libertad de compartir y alterar softwares - de libre distribución - volviéndolos de libre distribución también para cualquier - de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares - de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla - (algunos softwares de la FSF son cubiertos por la GNU Library General Public - License).

                              -

                              Cuando nos referimos a softwares de libre distribución, nos referimos a la - libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar - la libertad de distribución de copias de softwares de libre distribución (y - cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos - fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se - hacen algunas restricciones, para asegurar los derechos de los programadores, - prohibiendo a todas las personas su negación o la solicitación de su abdicación. - Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución - o modificación del software.

                              -

                              Por ejemplo, al distribuirse copias de determinado programa, por una tasa - determinada o gratuitamente, se debe informar sobre todos los derechos incidentes - sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia - Pública General GNU.

                              -

                              La protección de los derechos envuelve dos pasos: (1) copyright del software - y (2) licencia que da permiso legal para copia, distribución y/o modificación - del softwares.

                              -

                              Aún para la protección de la FSF y del autor es importante que todos entiendan - que no hay garantías para softwares de libre distribución. Si software se modifica - por alguien y lo pasa adelante, este software no más reflejará el trabajo original - del autor no pudiendo, por consiguiente, ser garantizado por aquél.

                              -

                              Finalmente, cualquier programa de libre distribución está constantemente amenazado - por las patentes de softwares. Buscamos evitar el peligro de que distribuidores - de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. - Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación - de patente se debe hacer permitiendo el uso por cualquier individuo, sin la - necesidad de licencia de uso.

                              -

                              Los términos y condiciones precisas para copia, distribución y modificación - siguen abajo:

                              -
                              -

                              Licencia Pública General GNU

                              -

                              TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN -

                              - -
                                - -

                              1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga - un aviso colocado por el detentor de los derechos de autor diciendo que aquel - podrá ser distribuido en las condiciones de la Licencia Pública General. El - Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado - en un Programa y significa tanto el propio Programa, como cualquier de los - trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, - un trabajo que contenga el Programa o una parte de este, en su forma original - o con modificaciones o traducido para una otra lengua (la traducción está - incluida sin limitaciones en el término ``modificación'').

                                -

                                Actividades distintas de copia, distribución y modificación no están cubiertas - por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa - no está restringido y la salida del Programa está cubierta solamente en - el caso de que su contenido contenga trabajos basados en el Programa (independientemente - de que hayan sido creados por la ejecución del Programa). Si esto es así, - depende de las funciones ejecutadas por el Programa.

                                2. - -

                              2. El código fuente del Programa, de la forma como fue recibido, puede ser - copiado y distribuido, en cualquier media, desde que sea providenciado un - aviso adecuado sobre los copyrights y la negación de garantías, y todos los - avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, - estén inalterados y que cualquier producto oriundo del Programa esté acompañado - de esta Licencia Pública General.

                                -

                                Está permitido el cobro de tasas por el acto físico de transferencia o - grabación de copias, y pueden ser dadas garantías y soporte en cambio del - cobro de valores.

                                3. - - -
                              3. -

                                Se puede modificar la copia o copias del Programa de cualquier forma que - se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir - tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

                                - -
                                  -

                                1. Debe existir un aviso destacado de que los datos originales fueron alterados - en los archivos y las fechas de los cambios;

                                  2. - -

                                2. Debe existir un aviso de que el trabajo distribuido o publicado es, - de forma total o parcial, derivado del Programa o de alguna parte suya, - y que puede ser licenciado totalmente sin costes para terceros bajo los - términos de esta Licencia.

                                  3. - -

                                3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, - en el inicio de tu ejecución, presentar la información de copyright y - de ausencia de garantías (o de que la garantía es de responsabilidad de - terceros), y que los usuarios pueden redistribuir el programa bajo estas - condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

                                  4. -
                                - - Estos requisitos se aplican a trabajos de modificación en general. Si - algunas secciones identificables no sean derivadas del Programa, y pueden - ser consideradas como partes independientes, entonces esta Licencia y sus - Términos no se aplican a aquellas secciones cuando distribuidas separadamente. - Pero al distribuir aquellas secciones como parte de un trabajo basado en - el Programa, la distribución, como un todo, debe contener los términos de - esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no - a cada una de las partes independientemente de quem los tenga desarrollado. - Más que tener intención de contestar los derechos sobre el trabajo desarrollado - por alguien, esta sección objetiva propiciar la correcta distribución de - trabajos derivados del Programa. - Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado - en él ni a un trabajo basado en él, a un volumen de almacenaje o media de - distribución no obliga la utilización de esta Licencia y de sus términos - al trabajo. -
                                4. - - -
                              4. -

                                Están permitidas, la copia y la distribución, del Programa (o un trabajo - basado en éste) en la forma de código objeto o ejecutable de acuerdo con los - términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

                                - -
                                  -

                                1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos - en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada - para manejo de softwares o

                                  -
                                  2. -

                                2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, - de poner a disposición a terceros, por un coste no superior al coste del - medio físico de almacenaje, una copia completa de los códigos fuente en - medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

                                  -
                                  3. -

                                3. Esté acompañada con la misma información recibida en relación con la - oferta de la distribución del código fuente correspondiente (esta alternativa - solamente está permitida para distribuciones no comerciales y solamente - si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, - de acuerdo con la sección 2 arriba).

                                  -
                                  4. -
                                - El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones - en aquel trabajo. Cuando se habla en códigos fuentes completos significa - hablar de todos los fuentes de todos los módulos, además de las definiciones - de interfaces asociadas, archivos, scripts utilizados en la compilación - y instalación del ejecutable. Como una excepción excepcional, el código - fuente distribuido podrá no incluir algunos componentes que no se encuentren - en su escopo, como compilador, kernel, etc... para el SO donde el trabajo - sea ejecutado. - Si la distribución del ejecutable o objeto se hace, a través de acceso - a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente - de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos - con los objetos simultáneamente -
                                5. - -
                              5. -

                                No está permitida la copia, modificación, sublicenciamiento o distribución - del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier - tentativa de copia, modificación, sublicenciamiento o distribución del Programa - está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. - Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, - no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas - de esta Licencia.

                                6. -
                              6. -

                                No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá - documento o contrato que garantice permiso de modificación o distribución - del Programa o sus trabajos derivados. Estas acciones están prohibidas por - ley, en el caso de que no se acepten las condiciones de esta Licencia. La - modificación o distribución del Programa, o cualquier trabajo basado en éste, - implica en la aceptación de esta Licencia y de todos los términos de ésta - para copia, distribución o modificación del Programa o trabajos basados en - éste.

                                7. -
                              7. -

                                Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), - el recipiente automáticamente recibe una licencia del detentor original de - los derechos de copia, distribución o modificación del Programa objeto de - estos términos y condiciones. No pueden ser impuestas otras restricciones - en los recipientes.

                                8. - -
                              8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes - o derechos de autor, se impongan restricciones, que contradigan esta Licencia, - estos no exentan de su aplicación. Si no es posible distribuir el Programa - de forma a garantizar simultáneamente las obligaciones de esta Licencia y - otras que sean necesarias, entonces el Programa no podrá ser distribuido. -

                                Si esta Sección se considera, inválida por cualquier motivo particular - o general, su resultado implicará en la invalidación general de esta licencia - en la copia, modificación, sublicenciamiento o distribución del Programa - o trabajos basados en éste.

                                -

                                El propósito de esta sección no es, de forma alguna, incitar a quien quiera - que sea a infringir derechos reclamados en cuestiones válidas y procedentes, - y si proteger las premisas del sistema de libre distribución de software. - Muchas personas tienen hecho contribuciones generosas al sistema, en la - forma de programas, y es necesario garantizar la consistencia y credibilidad - del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución - de los softwares.

                                -

                                Esta sección pretende hacer claro los motivos que crearan las demás cláusulas - de estas Licencia.

                                9. - -
                              9. -

                                Si la distribución del Programa, dentro de los términos de esta Licencia, - tiene restricciones en algún País, por patentes o derechos de autor, el detentor - original de los derechos de autor del Programa bajo esta Licencia puede adicionar - explícitamente limitaciones geográficas de distribución, excluyendo aquellos - Países, haciendo con que la distribución solamente sea posible en los Países - no excluidos.

                                10. - -
                              10. -

                                La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) - puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública - General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos - objetivos y el espirito de la presente versión, pudiendo variar en detalles - referentes a nuevas situaciones encontradas.

                                -

                                A cada versión se da un número distinto. Si el Programa especifica, un - número de versión determinado de esta Licencia, que tenga en su contenido - la expresión ``o versión más actualizada'', es posible optar por las condiciones - de aquella versión o de cualquier versión más actualizada publicada por - la FSF.

                                11. - -
                              11. -

                                Si deseas incorporar parte del Programa en otros programas de libre distribución - de softwares hace falta autorización formal del autor. Para softwares que - la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde - que mantenido el espirito y objetivos originales de esta Licencia.

                                12. -
                              - -

                              AUSENCIA DE GARANTÍAS

                              -
                                -

                              1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER - GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE - EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS - DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, - LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD - Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS - CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y - REPAROS JUZGADOS NECESARIOS.

                                2. -

                              2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR - LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN - RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE - HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS - O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES - O DAÑOS.

                                -

                                FIN DE LA LICENCIA

                              - - -
                              -

                               

                              -

                              Apéndice

                              -

                              ¿Cómo aplicar estos términos a nuevos softwares?

                              -

                              Si has desarrollado un nuevo programa y deseas su amplia distribución para - el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, - que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

                              -

                              Para esto basta con anexar este aviso al programa. Se recomienda indicar aún - en el inicio de cada archivo fuente la ausencia de garantías y una anotación - de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

                              -

                              <nombre del programa y función> Copyright (C) 199X <Autor> -

                              -

                              Este programa es un software de libre distribución, que puede ser copiado - y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo - con la publicada por la Free Software Foundation, versión 2 de la licencia o - (a criterio del autor) cualquier versión posterior.

                              -

                              Este programa se distribuye en la expectativa de ser útil a sus usuarios, - pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE - ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General - 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. -

                              -

                              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:

                              -

                              Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares - NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software - de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. - Teclea 'muestra condic' para mayores detalles.

                              -

                              Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las - partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos - pueden variar o pueden ser accionados por otras interfaces como clic de ratón, - etc...

                              -

                               

                              -
                              -
                              - -www.conectiva.com - -
                              - - - - - diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt deleted file mode 100644 index 3efbe1ccee7..00000000000 --- a/htdocs/langs/nl_BE/html/gpl.txt +++ /dev/null @@ -1,340 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -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 deleted file mode 100644 index 778e2b02b41..00000000000 --- a/htdocs/langs/nl_NL/html/gpl.txt +++ /dev/null @@ -1,339 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -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 -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 -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -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. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -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 -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 -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 -software wijzigt. - -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 -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. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -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 -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - 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 -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -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, -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 -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -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 -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 -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -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 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -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 -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -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. - -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 -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 -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -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. - -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 -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 -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -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 -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, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -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 -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -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. - -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 -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -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, -dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van -deze licentie. \ No newline at end of file diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index c2d47f668da..4092c55ff2d 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ /** * \file htdocs/lib/admin.lib.php * \brief Library of admin functions - * \version $Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis 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.98 2011/07/31 23:25:40 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $ */ function security_prepare_head() { @@ -615,16 +615,41 @@ function Activate($value,$withdeps=1) // Activate module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } $objMod = new $modName($db); @@ -700,20 +725,46 @@ function UnActivate($value,$requiredby=1) $modName = $value; $ret=''; + $modulesdir=array(); // Desactivation du module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } if ($found) diff --git a/htdocs/lib/ajax.lib.php b/htdocs/lib/ajax.lib.php index 55def736688..7db1908bc49 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ */ diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1bdeb9562e6..49b67f9349a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 1d5b4951490..eedd6a8841c 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -29,7 +29,7 @@ * \ingroup core * \brief File that defines environment for all Dolibarr process (pages or scripts) * This script reads the conf file, init $lang, $db and and empty $user - * \version $Id: master.inc.php,v 1.351 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ */ @@ -70,14 +70,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root[]=$value; + $conf->file->dol_document_root['alt']=$value; } } diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index 454073d9730..d6bf7267439 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index b5304ba4198..6e1e7b262f4 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index bda35165079..b0a7c2dece6 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id$ + * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ */ if (session_id() == "") session_start(); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 8bccf934120..1da2adb751e 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ + * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index efbd289cb3f..a65f888ab11 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ + * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ */ require("../main.inc.php"); @@ -1645,6 +1646,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 8f373b577e8..79601ea1031 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 724900dc500..8cf57ec0b64 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ + * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ */ require("../main.inc.php"); @@ -271,5 +272,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); +llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); ?> diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index edb62d728d5..78ca25e85a6 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $ + * \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index f93935ffb16..e78dff8f646 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id$ + * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index e4e52c611b4..9edcafd59c0 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/group/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.39 2011/07/31 23:21:25 eldy Exp $ + * \version $Id: perms.php,v 1.40 2011/08/01 13:15:53 hregis Exp $ */ require("../../main.inc.php"); @@ -93,10 +93,34 @@ if ($_GET["id"]) // Charge les modules soumis a permissions $modules = array(); - foreach ($conf->file->dol_document_root as $dirroot) + $modulesdir = array(); + + foreach ($conf->file->dol_document_root as $type => $dirroot) + { + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } + + foreach ($modulesdir as $dir) { - $dir = $dirroot . "/includes/modules/"; - // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
                              "; $handle=@opendir($dir); @@ -292,5 +316,5 @@ if ($_GET["id"]) $db->close(); -llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.39 $'); +llxFooter('$Date: 2011/08/01 13:15:53 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index adb7fa764b6..47710b31d9d 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.56 2011/07/31 23:19:42 eldy Exp $ + * \version $Id: perms.php,v 1.57 2011/08/01 13:15:54 hregis Exp $ */ require("../main.inc.php"); @@ -120,12 +120,34 @@ $db->begin(); // Search all modules with permission and reload permissions def. $modules = array(); +$modulesdir = array(); -$listdir=$conf->file->dol_document_root; -foreach($listdir as $dirroot) +foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir=$dirroot."/includes/modules/"; + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} +foreach($modulesdir as $dir) +{ $handle=opendir($dir); if (is_resource($handle)) { @@ -373,5 +395,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.56 $'); +llxFooter('$Date: 2011/08/01 13:15:54 $ - $Revision: 1.57 $'); ?>